summaryrefslogtreecommitdiffstats
path: root/sound/soc/soc-jack.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-09-20 21:45:56 +0200
committerArnd Bergmann <arnd@arndb.de>2011-09-20 21:45:56 +0200
commit1fdb4888e45f1413972a8e9da55f3ffc08b9abcb (patch)
tree635ef73cdff38d21a529bbdcab4cd2cb39a29484 /sound/soc/soc-jack.c
parentMerge branches 'imx/cleanup' and 'stericsson/cleanup' of git+ssh://master.ker... (diff)
parentMerge branch 'omap_chip_remove_cleanup_3.2' of git://git.pwsan.com/linux-2.6 ... (diff)
downloadlinux-1fdb4888e45f1413972a8e9da55f3ffc08b9abcb.tar.xz
linux-1fdb4888e45f1413972a8e9da55f3ffc08b9abcb.zip
Merge branch 'omap/cleanup' into next/cleanup
Diffstat (limited to 'sound/soc/soc-jack.c')
-rw-r--r--sound/soc/soc-jack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
index 7c17b98d5846..38b00131b2fe 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
@@ -327,7 +327,7 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
IRQF_TRIGGER_FALLING,
gpios[i].name,
&gpios[i]);
- if (ret)
+ if (ret < 0)
goto err;
if (gpios[i].wake) {