From d61532f09e2b7dffef894e00007520b4a0d0ae70 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sat, 14 May 2011 22:22:38 -0700
Subject: [PATCH] --- yaml --- r: 250512 b: refs/heads/master c:
 215ef98677c3e43cefd2159d76543f368a7f87b9 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/input/touchscreen/atmel_tsadcc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3bf75d196b2d..51f1330cf94e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36682b81de32090f5c9fac165e71ab8939aab8c0
+refs/heads/master: 215ef98677c3e43cefd2159d76543f368a7f87b9
diff --git a/trunk/drivers/input/touchscreen/atmel_tsadcc.c b/trunk/drivers/input/touchscreen/atmel_tsadcc.c
index 3d9b5166ebe9..432c69be6ac6 100644
--- a/trunk/drivers/input/touchscreen/atmel_tsadcc.c
+++ b/trunk/drivers/input/touchscreen/atmel_tsadcc.c
@@ -317,7 +317,7 @@ static int __devinit atmel_tsadcc_probe(struct platform_device *pdev)
 err_release_mem:
 	release_mem_region(res->start, resource_size(res));
 err_free_dev:
-	input_free_device(ts_dev->input);
+	input_free_device(input_dev);
 err_free_mem:
 	kfree(ts_dev);
 	return err;