openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/wm8741' into asoc-next

This commit is contained in:
Mark Brown 2012-12-10 00:22:28 +09:00
parent 753ad46e86 fd64c45560
commit 59b4cd42f2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/codecs/wm8741.c
View File

@ -522,7 +522,7 @@ static int wm8741_i2c_probe(struct i2c_client *i2c,
return ret; return ret;
} }
wm8741->regmap = regmap_init_i2c(i2c, &wm8741_regmap); wm8741->regmap = devm_regmap_init_i2c(i2c, &wm8741_regmap);
if (IS_ERR(wm8741->regmap)) { if (IS_ERR(wm8741->regmap)) {
ret = PTR_ERR(wm8741->regmap); ret = PTR_ERR(wm8741->regmap);
dev_err(&i2c->dev, "Failed to init regmap: %d\n", ret); dev_err(&i2c->dev, "Failed to init regmap: %d\n", ret);
@ -582,7 +582,7 @@ static int __devinit wm8741_spi_probe(struct spi_device *spi)
return ret; return ret;
} }
wm8741->regmap = regmap_init_spi(spi, &wm8741_regmap); wm8741->regmap = devm_regmap_init_spi(spi, &wm8741_regmap);
if (IS_ERR(wm8741->regmap)) { if (IS_ERR(wm8741->regmap)) {
ret = PTR_ERR(wm8741->regmap); ret = PTR_ERR(wm8741->regmap);
dev_err(&spi->dev, "Failed to init regmap: %d\n", ret); dev_err(&spi->dev, "Failed to init regmap: %d\n", ret);