Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ecd069f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "diag: Do not clear masks during logging mode switch"

parents 6e13527e 8d32b38c

drivers/char/diag/diag_usb.c

+8 −7
Original line number Diff line number Diff line
@@ -219,13 +219,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);

}
@@ -234,6 +227,14 @@ 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;



	if (!atomic_read(&ch->connected) &&

		driver->usb_connected && diag_mask_param())

		diag_clear_masks(0);



	usb_disconnect(ch);

}