summaryrefslogtreecommitdiffstats
path: root/drivers/misc
diff options
context:
space:
mode:
authorPavan Savoy <pavan_savoy@ti.com>2012-08-03 14:49:41 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-08-16 10:11:45 -0700
commitb64365a52625e6ec5cf05dd984fba0fa69b24623 (patch)
tree00a5a0167427014db319c23cfe38a8921406a316 /drivers/misc
parent27712b3928bec9b1a889d7f60d718a35ca6c23b3 (diff)
downloadtalos-op-linux-b64365a52625e6ec5cf05dd984fba0fa69b24623.tar.gz
talos-op-linux-b64365a52625e6ec5cf05dd984fba0fa69b24623.zip
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>
Diffstat (limited to 'drivers/misc')
-rw-r--r--drivers/misc/ti-st/st_kim.c2
1 files changed, 1 insertions, 1 deletions
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 */
OpenPOWER on IntegriCloud