evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Linux Build Service Account 2018-12-05 06:01:19 -08:00 • committed by Gerrit - the friendly Code Review server
commit 93b010356e
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/char/diag/diag_usb.c
View file

@ -216,13 +216,6 @@ static void usb_connect_work_fn(struct work_struct *work)
*/ */
static void usb_disconnect(struct diag_usb_info *ch) 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) if (ch && ch->ops && ch->ops->close)
ch->ops->close(ch->ctxt, DIAG_USB_MODE); ch->ops->close(ch->ctxt, DIAG_USB_MODE);
} }
@ -231,6 +224,14 @@ static void usb_disconnect_work_fn(struct work_struct *work)
{ {
struct diag_usb_info *ch = container_of(work, struct diag_usb_info, struct diag_usb_info *ch = container_of(work, struct diag_usb_info,
disconnect_work); disconnect_work);
if (!ch)
return;
if (!atomic_read(&ch->connected) &&
driver->usb_connected && diag_mask_param())
diag_clear_masks(0);
usb_disconnect(ch); usb_disconnect(ch);
} }