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);