From d66027b53bfc9e49d5572a5bd86b923faa6bee0d Mon Sep 17 00:00:00 2001
From: Daniel Kurtz <djkurtz@chromium.org>
Date: Thu, 28 Jun 2012 21:08:03 +0800
Subject: [PATCH] --- yaml --- r: 318290 b: refs/heads/master c:
 c2ef9a1a248bc597f3275e8d52e8ad68416d039f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 9db2582e22df..7124ea7f6a48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec02ac2b7e1ad04ab2486fe9b2fbfc3ad5178f7c
+refs/heads/master: c2ef9a1a248bc597f3275e8d52e8ad68416d039f
diff --git a/trunk/drivers/input/touchscreen/atmel_mxt_ts.c b/trunk/drivers/input/touchscreen/atmel_mxt_ts.c
index b1108cae73ac..8b33f3ae4eba 100644
--- a/trunk/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/trunk/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -1154,7 +1154,7 @@ static int __devinit mxt_probe(struct i2c_client *client,
 		goto err_free_object;
 
 	error = request_threaded_irq(client->irq, NULL, mxt_interrupt,
-			pdata->irqflags, client->dev.driver->name, data);
+			pdata->irqflags, client->name, data);
 	if (error) {
 		dev_err(&client->dev, "Failed to register interrupt\n");
 		goto err_free_object;