From ad20ff920c1fd217578e2c637dd50c1878a21c06 Mon Sep 17 00:00:00 2001 From: Denis 'GNUtoo' Carikli Date: Sun, 26 Feb 2012 19:21:53 +0100 Subject: [PATCH] ASoC: wm8753: fix initialization Without that fix the wm8753 SPI initialization fails, and then produces a kernel panic during boot with the following call trace: Unable to handle kernel paging request at virtual address 37386d9b [] (regmap_get_val_bytes+0x0/0x14) from [] (snd_soc_codec_set_cache_io+0x9c/0xcc) [] (snd_soc_codec_set_cache_io+0x9c/0xcc) from [] (wm8753_probe+0x5c/0x1c4) [] (wm8753_probe+0x5c/0x1c4) from [] (soc_probe_codec+0x174/0x284) [] (soc_probe_codec+0x174/0x284) from [] (snd_soc_instantiate_cards+0x68c/0xe28) [] (snd_soc_instantiate_cards+0x68c/0xe28) from [] (snd_soc_register_card+0x240/0x2d4) [] (snd_soc_register_card+0x240/0x2d4) from [] (soc_probe+0x24/0x40) [] (soc_probe+0x24/0x40) from [] (platform_drv_probe+0x14/0x18) [...] The commit d3398ff05907167f463e119421b053ce043741d1 ( ASoC: Convert WM8753 to direct regmap API usage ) introduced the problem. Thanks to Lars-Peter Clausen for helping me a bit during the debugging. Signed-off-by: Denis 'GNUtoo' Carikli Signed-off-by: Mark Brown --- sound/soc/codecs/wm8753.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index 59c28dbc5fc9..e27e7b62b365 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -1578,6 +1578,9 @@ static int __devinit wm8753_spi_probe(struct spi_device *spi) dev_err(&spi->dev, "Failed to register CODEC: %d\n", ret); goto err_regmap; } + + return 0; + err_regmap: regmap_exit(wm8753->regmap); err: @@ -1634,6 +1637,8 @@ static __devinit int wm8753_i2c_probe(struct i2c_client *i2c, goto err_regmap; } + return 0; + err_regmap: regmap_exit(wm8753->regmap); err: -- GitLab