From 441d00d45811c99dde4c2f1dbe9d44c4f62093a9 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 25 Sep 2012 16:36:56 +0100 Subject: [PATCH] --- yaml --- r: 332167 b: refs/heads/master c: 5afe5bfe243d649aa5118c74317cbcbe85a04cb9 h: refs/heads/master i: 332165: 5e96fb9e3b24981e0df9be16c0292d7034584195 332163: 06f9fb95e9ebce6742e29b1a0490c007d68c6b69 332159: bc147880f58dd083d9de221c94d1d9b41a6d89bb v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm0010.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 68a70406ecee..b540de842a60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fff00cbca13ab303b3995353d22c47e6b0f68fd8 +refs/heads/master: 5afe5bfe243d649aa5118c74317cbcbe85a04cb9 diff --git a/trunk/sound/soc/codecs/wm0010.c b/trunk/sound/soc/codecs/wm0010.c index 4722acfb82a8..780110a15c97 100644 --- a/trunk/sound/soc/codecs/wm0010.c +++ b/trunk/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);