---

yaml --- r: 250509 b: refs/heads/master c: 1201e7e h: refs/heads/master i: 250507: 7d840b6 v: v3
git-mirror · May 12, 2011 · 8a981a7 · 8a981a7
1 parent 847be5d
commit 8a981a7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebcaaad9d5e8fd284b8dcf25a24999420f0f56d8
+refs/heads/master: 1201e7e67634624aec89317cf308cd0d3d8d4770
diff --git a/trunk/drivers/input/touchscreen/ads7846.c b/trunk/drivers/input/touchscreen/ads7846.c
@@ -966,6 +966,13 @@ static int __devinit ads7846_setup_pendown(struct spi_device *spi, struct ads784
 				pdata->gpio_pendown);
 			return err;
 		}
+		err = gpio_direction_input(pdata->gpio_pendown);
+		if (err) {
+			dev_err(&spi->dev, "failed to setup pendown GPIO%d\n",
+				pdata->gpio_pendown);
+			gpio_free(pdata->gpio_pendown);
+			return err;
+		}
 
 		ts->gpio_pendown = pdata->gpio_pendown;