1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/usb/usbip/stub_dev.c b/drivers/usb/usbip/stub_dev.c
index a3ec49bdc1e6..c653ce533430 100644
--- a/drivers/usb/usbip/stub_dev.c
+++ b/drivers/usb/usbip/stub_dev.c
@@ -219,7 +219,7 @@ static void stub_device_reset(struct usbip_device *ud)
 
         dev_dbg(&udev->dev, "device reset");
 
-        ret = usb_lock_device_for_reset(udev, sdev->interface);
+        ret = usb_lock_device_for_reset(udev, NULL);
         if (ret < 0) {
                 dev_err(&udev->dev, "lock for reset\n");
                 spin_lock_irq(&ud->lock);
@@ -252,7 +252,7 @@ static void stub_device_unusable(struct usbip_device *ud)
 
 /**
  * stub_device_alloc - allocate a new stub_device struct
- * @interface: usb_interface of a new device
+ * @udev: usb_device of a new device
  *
  * Allocates and initializes a new stub_device struct.
  */
@@ -388,7 +388,6 @@ err_files:
 err_port:
         dev_set_drvdata(&udev->dev, NULL);
         usb_put_dev(udev);
-        kthread_stop_put(sdev->ud.eh);
 
         busid_priv->sdev = NULL;
         stub_device_free(sdev);
@@ -449,7 +448,7 @@ static void stub_disconnect(struct usb_device *udev)
         }
 
         /* If usb reset is called from event handler */
-        if (busid_priv->sdev->ud.eh == current)
+        if (usbip_in_eh(current))
                 return;
 
         /* shutdown the current connection */