From d139b4b78722661a0b9d7bee58a4a12a751a832d Mon Sep 17 00:00:00 2001
From: Pavan Savoy <pavan_savoy@ti.com>
Date: Fri, 3 Aug 2012 14:49:41 -0500
Subject: [PATCH] --- yaml --- r: 324327 b: refs/heads/master c:
 b64365a52625e6ec5cf05dd984fba0fa69b24623 h: refs/heads/master i:   324325:
 81613987b9031b7155a958f91b96f993c2be580c   324323:
 9b70b6b5c7bc8782ee5f34ed1aeb65be5ac47706   324319:
 6190633bb7e59e588daae7ef23b0c0d2ade13508 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/misc/ti-st/st_kim.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c83ebb40ea2f..e6f58c6b2de9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27712b3928bec9b1a889d7f60d718a35ca6c23b3
+refs/heads/master: b64365a52625e6ec5cf05dd984fba0fa69b24623
diff --git a/trunk/drivers/misc/ti-st/st_kim.c b/trunk/drivers/misc/ti-st/st_kim.c
index 847406abd0f8..54ff644aa56b 100644
--- a/trunk/drivers/misc/ti-st/st_kim.c
+++ b/trunk/drivers/misc/ti-st/st_kim.c
@@ -524,7 +524,7 @@ long st_kim_stop(void *kim_data)
 			msecs_to_jiffies(LDISC_TIME));
 	if (!err) {		/* timeout */
 		pr_err(" timed out waiting for ldisc to be un-installed");
-		return -ETIMEDOUT;
+		err = -ETIMEDOUT;
 	}
 
 	/* platform specific disable */