summaryrefslogtreecommitdiff
path: root/sound/atmel/ac97c.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-08-04 22:44:43 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-08-09 00:42:11 (GMT)
commit29591ed4ac6fe00e3ff23b5be0cdc7016ef9c47e (patch)
tree8d4698dabb5cebad1f4cd45eeecd5d75eb1afcc0 /sound/atmel/ac97c.c
parenta96edd59b2bc88b3d1ea47e0ba48076d65db9302 (diff)
downloadlinux-fsl-qoriq-29591ed4ac6fe00e3ff23b5be0cdc7016ef9c47e.tar.xz
ASoC: Tegra: wm8903 machine driver: Allow re-insertion of module
Two issues were preventing module snd-soc-tegra-wm8903.ko from being removed and re-inserted: a) The speaker-enable GPIO is hosted by the WM8903 chip. This GPIO must be freed before snd_soc_unregister_card() is called, because that triggers wm8903.c:wm8903_remove(), which calls gpiochip_remove(), which then fails if any of the GPIOs are in use. To solve this, free all GPIOs first, so the code doesn't care where they come from. b) We need to call snd_soc_jack_free_gpios() to match the call to snd_soc_jack_add_gpios() during initialization. Without this, the call to snd_soc_jack_add_gpios() fails during any subsequent modprobe and initialization, since the GPIO and IRQ are already registered. In turn, this causes the headphone state not to be monitored, so the headphone is assumed not to be plugged in, and the audio path to it is never enabled. Signed-off-by: Stephen Warren <swarren@nvidia.com> Cc: stable@kernel.org Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/atmel/ac97c.c')
0 files changed, 0 insertions, 0 deletions