aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/omap-twl4030.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2014-06-03 06:31:46 -0400
committerTakashi Iwai <tiwai@suse.de>2014-06-03 06:52:21 -0400
commit16088cb6c02d0b766b9b8d7edff98da7f1c93205 (patch)
tree0628c45d6c575362fc99c318309565bd17805432 /sound/soc/omap/omap-twl4030.c
parent8743dcd6639c28204ac03fb3e9db7932e3d85418 (diff)
ASoC: Fix wrong argument for card remove callbacks
The commit [e1d4d3c8: ASoC: free jack GPIOs before the sound card is freed] introduced snd_soc_card remove callbacks to a few drivers, but they are implemented with a wrong argument type. The callback should receive snd_soc_card pointer instead of snd_soc_pcm_runtime. Fixes: e1d4d3c854f2 ('ASoC: free jack GPIOs before the sound card is freed') Acked-by: Mark Brown <broonie@linaro.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc/omap/omap-twl4030.c')
-rw-r--r--sound/soc/omap/omap-twl4030.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/omap/omap-twl4030.c
index b4e282871658..f8a6adc2d81c 100644
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/omap/omap-twl4030.c
@@ -231,9 +231,8 @@ static int omap_twl4030_init(struct snd_soc_pcm_runtime *rtd)
231 return ret; 231 return ret;
232} 232}
233 233
234static int omap_twl4030_card_remove(struct snd_soc_pcm_runtime *rtd) 234static int omap_twl4030_card_remove(struct snd_soc_card *card)
235{ 235{
236 struct snd_soc_card *card = rtd->card;
237 struct omap_twl4030 *priv = snd_soc_card_get_drvdata(card); 236 struct omap_twl4030 *priv = snd_soc_card_get_drvdata(card);
238 237
239 if (priv->jack_detect > 0) 238 if (priv->jack_detect > 0)