Merge "diag: Do not close MHI channels when usb is disconnected" (c1ff98eb) · Commits · e / devices / android_kernel_sony_msm8998

drivers/char/diag/diagfwd_bridge.c

+13 −1

Original line number	Diff line number	Diff line
		/* 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;