diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-06-03 12:31:46 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-06-03 12:52:21 +0200 |
| commit | 16088cb6c02d0b766b9b8d7edff98da7f1c93205 (patch) | |
| tree | 0628c45d6c575362fc99c318309565bd17805432 /sound/soc/pxa | |
| parent | Merge tag 'asoc-v3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/bro... (diff) | |
| download | linux-16088cb6c02d0b766b9b8d7edff98da7f1c93205.tar.xz linux-16088cb6c02d0b766b9b8d7edff98da7f1c93205.zip | |
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/pxa')
| -rw-r--r-- | sound/soc/pxa/hx4700.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c index 6b81acaffddd..05559a725bec 100644 --- a/sound/soc/pxa/hx4700.c +++ b/sound/soc/pxa/hx4700.c @@ -152,7 +152,7 @@ static int hx4700_ak4641_init(struct snd_soc_pcm_runtime *rtd) return err; } -static int hx4700_card_remove(struct snd_soc_pcm_runtime *rtd) +static int hx4700_card_remove(struct snd_soc_card *card) { snd_soc_jack_free_gpios(&hs_jack, 1, &hs_jack_gpio); |