From 5fed047b959875a3777eeb8a8d5f72181dc10458 Mon Sep 17 00:00:00 2001
From: Vasiliy Kulikov <segooon@gmail.com>
Date: Sun, 12 Sep 2010 22:57:19 +0400
Subject: [PATCH] --- yaml --- r: 220603 b: refs/heads/master c:
 02bf07492341d94e29890082201dd69dbf406570 h: refs/heads/master i:   220601:
 54393629d085a4756d214936ac4260b0d3939433   220599:
 04545d8aec675f08771204cafd66feebc2eba3de v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/gpio/stmpe-gpio.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 91e6c553269b..8bb54594960f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1819ebcf1dc5ba9a19dab1f51a21af6274bbd829
+refs/heads/master: 02bf07492341d94e29890082201dd69dbf406570
diff --git a/trunk/drivers/gpio/stmpe-gpio.c b/trunk/drivers/gpio/stmpe-gpio.c
index 932759db1ac2..7c9e6a052c45 100644
--- a/trunk/drivers/gpio/stmpe-gpio.c
+++ b/trunk/drivers/gpio/stmpe-gpio.c
@@ -315,11 +315,11 @@ static int __devinit stmpe_gpio_probe(struct platform_device *pdev)
 
 	ret = stmpe_enable(stmpe, STMPE_BLOCK_GPIO);
 	if (ret)
-		return ret;
+		goto out_free;
 
 	ret = stmpe_gpio_irq_init(stmpe_gpio);
 	if (ret)
-		goto out_free;
+		goto out_disable;
 
 	ret = request_threaded_irq(irq, NULL, stmpe_gpio_irq, IRQF_ONESHOT,
 				   "stmpe-gpio", stmpe_gpio);
@@ -345,6 +345,8 @@ static int __devinit stmpe_gpio_probe(struct platform_device *pdev)
 	free_irq(irq, stmpe_gpio);
 out_removeirq:
 	stmpe_gpio_irq_remove(stmpe_gpio);
+out_disable:
+	stmpe_disable(stmpe, STMPE_BLOCK_GPIO);
 out_free:
 	kfree(stmpe_gpio);
 	return ret;