summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-25 17:36:56 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-26 14:53:59 +0200
commit5afe5bfe243d649aa5118c74317cbcbe85a04cb9 (patch)
tree02455c65723c758b6781ca18bb2daba7e77f63e7
parentASoC: wm0010: Allow slow GPIO for reset (diff)
downloadlinux-5afe5bfe243d649aa5118c74317cbcbe85a04cb9.tar.xz
linux-5afe5bfe243d649aa5118c74317cbcbe85a04cb9.zip
ASoC: wm0010: Don't check if reset GPIO is defined when removing
We will fail to probe without one. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/codecs/wm0010.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/codecs/wm0010.c b/sound/soc/codecs/wm0010.c
index 4722acfb82a8..780110a15c97 100644
--- a/sound/soc/codecs/wm0010.c
+++ b/sound/soc/codecs/wm0010.c
@@ -917,11 +917,8 @@ static int __devexit wm0010_spi_remove(struct spi_device *spi)
snd_soc_unregister_codec(&spi->dev);
- if (wm0010->gpio_reset) {
- /* Remember to put chip back into reset */
- gpio_set_value_cansleep(wm0010->gpio_reset,
- wm0010->gpio_reset_value);
- }
+ gpio_set_value_cansleep(wm0010->gpio_reset,
+ wm0010->gpio_reset_value);
if (wm0010->irq)
free_irq(wm0010->irq, wm0010);