Merge "diag: Do not clear masks during logging mode switch" (ef0d6fe7) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/char/diag/diag_usb.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -220,13 +220,6 @@ static void usb_connect_work_fn(struct work_struct *work)
		*/
		static void usb_disconnect(struct diag_usb_info *ch)
		{
		if (!ch)
		return;

		if (!atomic_read(&ch->connected) &&
		driver->usb_connected && diag_mask_param())
		diag_clear_masks(0);

		if (ch && ch->ops && ch->ops->close)
		ch->ops->close(ch->ctxt, DIAG_USB_MODE);
		}
		@@ -236,6 +229,9 @@ static void usb_disconnect_work_fn(struct work_struct *work)
		struct diag_usb_info *ch = container_of(work, struct diag_usb_info,
		disconnect_work);

		if (!ch)
		return;

		atomic_set(&ch->disconnected, 1);
		DIAG_LOG(DIAG_DEBUG_PERIPHERALS,
		"diag: USB channel %s: disconnected_status: %d, connected_status: %d\n",
		@@ -248,6 +244,10 @@ static void usb_disconnect_work_fn(struct work_struct *work)
		"diag: USB channel %s: Cleared disconnected(%d) and connected(%d) status\n",
		ch->name, atomic_read(&ch->disconnected), atomic_read(&ch->connected));

		if (!atomic_read(&ch->connected) &&
		driver->usb_connected && diag_mask_param())
		diag_clear_masks(0);

		usb_disconnect(ch);
		}