From: Pavan Savoy <pavan_savoy@ti.com>
Date: Fri, 3 Aug 2012 19:49:41 +0000 (-0500)
Subject: drivers/misc/ti-st: chip_disable on timeout
X-Git-Tag: next-20120817~14^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b64365a52625e6ec5cf05dd984fba0fa69b24623;p=karo-tx-linux.git

drivers/misc/ti-st: chip_disable on timeout

If the communication with the WiLink breaks down for whatever reasons & the
ti-st driver is unable to un-install the line-discipline during clean-up in
st_kim_stop, the GPIO should be held low (BT_EN=0) & the platform's chip
disable hook shall also be called.

Signed-off-by: Pavan Savoy <pavan_savoy@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/misc/ti-st/st_kim.c b/drivers/misc/ti-st/st_kim.c
index 847406abd0f8..54ff644aa56b 100644
--- a/drivers/misc/ti-st/st_kim.c
+++ b/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 */