Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / gpio / gpio-msm-v1.c

diff --git a/drivers/gpio/gpio-msm-v1.c b/drivers/gpio/gpio-msm-v1.c
index 09e895d018b70b476281604a5b61db0cd65078bb..edf285e2666770ffeffc96cebb5d1258c697d78b 100644 (file)
--- a/drivers/gpio/gpio-msm-v1.c
+++ b/drivers/gpio/gpio-msm-v1.c
@@ -686,7 +686,7 @@ static int gpio_msm_v1_probe(struct platform_device *pdev)
        irq_set_chained_handler(irq1, msm_gpio_irq_handler);
        irq_set_chained_handler(irq2, msm_gpio_irq_handler);
        irq_set_irq_wake(irq1, 1);
-       irq_set_irq_wake(irq2, 2);
+       irq_set_irq_wake(irq2, 1);
        return 0;
 }