diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-01 23:35:25 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-01 23:35:25 -0500 |
| commit | a275ddf7b5aea1b57d9892acdfe95aaf0c5069b0 (patch) | |
| tree | 4f969d59ed8d12d85507b2eb2590c610587b725e /sound/soc | |
| parent | f5a1345be7edc28bb2cb7f1570f6772037e9a575 (diff) | |
| parent | c5e6f5fa0ad8e0d66cdb459a6193afc4f0ee8387 (diff) | |
Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8960.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8960.c b/sound/soc/codecs/wm8960.c index f0f6f6601785..cf09cb625a7b 100644 --- a/sound/soc/codecs/wm8960.c +++ b/sound/soc/codecs/wm8960.c | |||
| @@ -1040,7 +1040,7 @@ static __devinit int wm8960_i2c_probe(struct i2c_client *i2c, | |||
| 1040 | if (wm8960 == NULL) | 1040 | if (wm8960 == NULL) |
| 1041 | return -ENOMEM; | 1041 | return -ENOMEM; |
| 1042 | 1042 | ||
| 1043 | wm8960->regmap = regmap_init_i2c(i2c, &wm8960_regmap); | 1043 | wm8960->regmap = devm_regmap_init_i2c(i2c, &wm8960_regmap); |
| 1044 | if (IS_ERR(wm8960->regmap)) | 1044 | if (IS_ERR(wm8960->regmap)) |
| 1045 | return PTR_ERR(wm8960->regmap); | 1045 | return PTR_ERR(wm8960->regmap); |
| 1046 | 1046 | ||