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

Commit 134a9265 authored by Alexander Popov's avatar Alexander Popov Committed by Greg Kroah-Hartman
Browse files

usbip: don't call stub_device_reset() during stub_disconnect() 



stub_disconnect() calls stub_device_reset() during usb_unbind_device() when
usb device is locked. So usb_lock_device_for_reset() in stub_device_reset()
in that case polls for one second and returns -EBUSY anyway.

Remove useless flag USBIP_EH_RESET from SDEV_EVENT_REMOVED.

Signed-off-by: default avatarAlexander Popov <alpopov@ptsecurity.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d0e08b00

drivers/usb/usbip/usbip_common.h

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ enum usbip_side { 
#define USBIP_EH_RESET		(1 << 2)

#define USBIP_EH_UNUSABLE	(1 << 3)



#define SDEV_EVENT_REMOVED   (USBIP_EH_SHUTDOWN | USBIP_EH_RESET | USBIP_EH_BYE)

#define	SDEV_EVENT_REMOVED	(USBIP_EH_SHUTDOWN | USBIP_EH_BYE)

#define	SDEV_EVENT_DOWN		(USBIP_EH_SHUTDOWN | USBIP_EH_RESET)

#define	SDEV_EVENT_ERROR_TCP	(USBIP_EH_SHUTDOWN | USBIP_EH_RESET)

#define	SDEV_EVENT_ERROR_SUBMIT	(USBIP_EH_SHUTDOWN | USBIP_EH_RESET)