aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/linux/linux-omap-psp-2.6.32/0018-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/linux/linux-omap-psp-2.6.32/0018-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch')
-rw-r--r--recipes/linux/linux-omap-psp-2.6.32/0018-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/recipes/linux/linux-omap-psp-2.6.32/0018-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch b/recipes/linux/linux-omap-psp-2.6.32/0018-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch
index 10a9199366..cc0f2f0e16 100644
--- a/recipes/linux/linux-omap-psp-2.6.32/0018-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch
+++ b/recipes/linux/linux-omap-psp-2.6.32/0018-drivers-input-touchscreen-ads7846-return-ENODEV-if-d.patch
@@ -1,7 +1,7 @@
-From 7e5f28ca06be8efdbe2c03a252e09a2d5a1b8384 Mon Sep 17 00:00:00 2001
+From ea0fbdecf6d630d93ce03e64fb70c4740ed08f56 Mon Sep 17 00:00:00 2001
From: Steve Sakoman <sakoman@gmail.com>
Date: Tue, 15 Dec 2009 15:24:10 -0800
-Subject: [PATCH 18/30] drivers: input: touchscreen: ads7846: return ENODEV if device is not found
+Subject: [PATCH 18/42] drivers: input: touchscreen: ads7846: return ENODEV if device is not found
Signed-off-by: Steve Sakoman <sakoman@gmail.com>
---
@@ -9,10 +9,10 @@ Signed-off-by: Steve Sakoman <sakoman@gmail.com>
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
-index 52d2ca1..ce12c63 100644
+index e53ac1f..45287ab 100644
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
-@@ -1161,9 +1161,16 @@ static int __devinit ads7846_probe(struct spi_device *spi)
+@@ -1165,9 +1165,16 @@ static int __devinit ads7846_probe(struct spi_device *spi)
/* take a first sample, leaving nPENIRQ active and vREF off; avoid
* the touchscreen, in case it's not connected.
*/
@@ -30,7 +30,7 @@ index 52d2ca1..ce12c63 100644
err = sysfs_create_group(&spi->dev.kobj, &ads784x_attr_group);
if (err)
goto err_remove_hwmon;
-@@ -1181,7 +1188,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
+@@ -1188,7 +1195,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
err_free_irq:
free_irq(spi->irq, ts);
err_free_gpio:
@@ -39,7 +39,7 @@ index 52d2ca1..ce12c63 100644
gpio_free(ts->gpio_pendown);
err_cleanup_filter:
if (ts->filter_cleanup)
-@@ -1208,7 +1215,7 @@ static int __devexit ads7846_remove(struct spi_device *spi)
+@@ -1216,7 +1223,7 @@ static int __devexit ads7846_remove(struct spi_device *spi)
/* suspend left the IRQ disabled */
enable_irq(ts->spi->irq);