diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-03 22:59:40 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-03 22:59:40 -0800 |
| commit | c1ff98eb33dfd47cfe1c9e60f51dddc137b27aa1 (patch) | |
| tree | a4beaf6995d2e46152124e58864d35ecf066d2a7 | |
| parent | b1615eab2bbe33b384e3cd19017a8e311ba48577 (diff) | |
| parent | 837039b26f2dfe27985a62600851fd75981d3850 (diff) | |
Merge "diag: Do not close MHI channels when usb is disconnected"
| -rw-r--r-- | drivers/char/diag/diagfwd_bridge.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/char/diag/diagfwd_bridge.c b/drivers/char/diag/diagfwd_bridge.c index 0462a64614f3..3342984eb795 100644 --- a/drivers/char/diag/diagfwd_bridge.c +++ b/drivers/char/diag/diagfwd_bridge.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -90,6 +90,18 @@ static int diagfwd_bridge_mux_disconnect(int id, int mode) { if (id < 0 || id >= NUM_REMOTE_DEV) return -EINVAL; + + if ((mode == DIAG_USB_MODE && + driver->logging_mode == DIAG_MEMORY_DEVICE_MODE) || + (mode == DIAG_MEMORY_DEVICE_MODE && + driver->logging_mode == DIAG_USB_MODE)) { + /* + * Don't close the MHI channels when usb is disconnected + * and a process is running in memory device mode. + */ + return 0; + } + if (bridge_info[id].dev_ops && bridge_info[id].dev_ops->close) bridge_info[id].dev_ops->close(bridge_info[id].ctxt); return 0; |