diff options
| author |   Shuah Khan <skhan@linuxfoundation.org> | 2019-05-02 13:47:18 -0600 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-21 08:34:49 +0200 |
| commit | 3a38e874d70b1c80a3e3118be6fc010b558cc050 (patch) | |
| tree | 7ac8cd80781373ea5279cfcec0b38ab060346334 /drivers/usb/usbip | |
| parent | Linux 5.2-rc1 (diff) | |
| download | linux-dev-3a38e874d70b1c80a3e3118be6fc010b558cc050.tar.xz linux-dev-3a38e874d70b1c80a3e3118be6fc010b558cc050.zip | |
usbip: usbip_host: cleanup do_rebind() return path
Cleanup do_rebind() return path and use common return path.
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/usbip')
| -rw-r--r-- | drivers/usb/usbip/stub_main.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/usbip/stub_main.c b/drivers/usb/usbip/stub_main.c index bf8a5feb0ee9..2e4bfccd4bfc 100644 --- a/drivers/usb/usbip/stub_main.c +++ b/drivers/usb/usbip/stub_main.c @@ -201,7 +201,7 @@ static DRIVER_ATTR_RW(match_busid); static int do_rebind(char *busid, struct bus_id_priv *busid_priv) { - int ret; + int ret = 0; /* device_attach() callers should hold parent lock for USB */ if (busid_priv->udev->dev.parent) @@ -209,11 +209,9 @@ static int do_rebind(char *busid, struct bus_id_priv *busid_priv) ret = device_attach(&busid_priv->udev->dev); if (busid_priv->udev->dev.parent) device_unlock(busid_priv->udev->dev.parent); - if (ret < 0) { + if (ret < 0) dev_err(&busid_priv->udev->dev, "rebind failed\n"); - return ret; - } - return 0; + return ret; } static void stub_device_rebind(void) |