---

yaml --- r: 220603 b: refs/heads/master c: 02bf074 h: refs/heads/master i: 220601: 5439362 220599: 04545d8 v: v3
git-mirror · Oct 28, 2010 · 5fed047 · 5fed047
1 parent aa68837
commit 5fed047
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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;