commit c230e1186c9d130bb5f437b45175362f76566708
author Linux Build Service Account <lnxbuild@localhost> Tue Jan 17 07:14:34 2012 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Tue Jan 17 07:14:34 2012 -0800
tree 15e99ec65aa14f4bc70cae7a9cac3d4636776a96
parent 8086b13484001b0f966710b15d7aafdf3c95918b
parent bfe8f3025a6d70ab2c9bd3a51cb5e67453ff7373

Merge "input: atmel_mxt_ts: Release irq and reset gpios" into msm-3.0

drivers/input/touchscreen/atmel_mxt_ts.c

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index c954260..3c98a75 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1750,6 +1750,12 @@
 	else
 		mxt_regulator_configure(data, false);
 
+	if (gpio_is_valid(data->pdata->reset_gpio))
+		gpio_free(data->pdata->reset_gpio);
+
+	if (gpio_is_valid(data->pdata->irq_gpio))
+		gpio_free(data->pdata->irq_gpio);
+
 	kfree(data->object_table);
 	kfree(data);