diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:32 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-09 10:22:32 -0500 |
| commit | e7d28c8ca476beed80a299d3587afa5448edb356 (patch) | |
| tree | 328ab006d39999cc1c9da2ce021902fda5bd942a /sound | |
| parent | 7a7f9875d9d35315c22830be5ce7fdd80b1d1ab0 (diff) | |
| parent | c5e6f5fa0ad8e0d66cdb459a6193afc4f0ee8387 (diff) | |
Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next
Diffstat (limited to 'sound')
| -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 | ||