aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-08-02 11:02:35 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-08-02 11:02:35 +0000
commitecdbc951bcd79d22bcbb3749aab82f3526501870 (patch)
treed3bec95552210b61caf93c22f08462ebe70eacd2 /target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch
parent1884a9821a417670d1ba2178d33a6219c91fc679 (diff)
downloadmaster-187ad058-ecdbc951bcd79d22bcbb3749aab82f3526501870.tar.gz
master-187ad058-ecdbc951bcd79d22bcbb3749aab82f3526501870.tar.bz2
master-187ad058-ecdbc951bcd79d22bcbb3749aab82f3526501870.zip
[kernel] refresh 2.6.30 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17093 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch b/target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch
index 068d850ef0..b7214b9d6d 100644
--- a/target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch
+++ b/target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch
@@ -9,11 +9,9 @@ Date: Fri Jul 31 18:26:48 2009 +0200
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
-diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
-index 28346fb..639333a 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
-@@ -220,6 +220,9 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
+@@ -220,6 +220,9 @@ int snd_soc_jack_add_gpios(struct snd_so
if (ret)
goto err;
@@ -23,7 +21,7 @@ index 28346fb..639333a 100644
ret = request_irq(gpio_to_irq(gpios[i].gpio),
gpio_handler,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-@@ -227,9 +230,6 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
+@@ -227,9 +230,6 @@ int snd_soc_jack_add_gpios(struct snd_so
&gpios[i]);
if (ret)
goto err;