---

yaml --- r: 324327 b: refs/heads/master c: b64365a h: refs/heads/master i: 324325: 8161398 324323: 9b70b6b 324319: 6190633 v: v3
git-mirror · Aug 16, 2012 · d139b4b · d139b4b
1 parent 142e7ea
commit d139b4b
Show file tree

Hide file tree

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