Title: [9102] trunk/drivers/input/touchscreen/ad7160.c: [#6066] AD7160 Linux Driver Support: re-enable interrupts on error return
- Revision
- 9102
- Author
- hennerich
- Date
- 2010-08-25 12:00:09 -0400 (Wed, 25 Aug 2010)
Log Message
[#6066] AD7160 Linux Driver Support: re-enable interrupts on error return
Modified Paths
Diff
Modified: trunk/drivers/input/touchscreen/ad7160.c (9101 => 9102)
--- trunk/drivers/input/touchscreen/ad7160.c 2010-08-25 15:58:09 UTC (rev 9101)
+++ trunk/drivers/input/touchscreen/ad7160.c 2010-08-25 16:00:09 UTC (rev 9102)
@@ -784,6 +784,8 @@
ret = ad7160_enter_boot_mode(ts);
if (ret < 0) {
+ if (!irq_disabled)
+ __ad7160_enable(ts);
mutex_unlock(&ts->mutex);
dev_err(dev, "failed to enter boot mode\n");
return ret;
@@ -802,8 +804,6 @@
dev_err(dev, "verify flash failed\n");
ad7160_setup(ts);
- if (!irq_disabled)
- __ad7160_enable(ts);
mutex_unlock(&ts->mutex);
return ret;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
