---

yaml --- r: 332167 b: refs/heads/master c: 5afe5bf h: refs/heads/master i: 332165: 5e96fb9 332163: 06f9fb9 332159: bc14788 v: v3
git-mirror · Sep 26, 2012 · 441d00d · 441d00d
1 parent f6dca28
commit 441d00d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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);