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 */