Commit 3a38e874 authored by Shuah Khan's avatar Shuah Khan Committed by Greg Kroah-Hartman

usbip: usbip_host: cleanup do_rebind() return path

Cleanup do_rebind() return path and use common return path.
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a188339c
...@@ -201,7 +201,7 @@ static DRIVER_ATTR_RW(match_busid); ...@@ -201,7 +201,7 @@ static DRIVER_ATTR_RW(match_busid);
static int do_rebind(char *busid, struct bus_id_priv *busid_priv) 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 */ /* device_attach() callers should hold parent lock for USB */
if (busid_priv->udev->dev.parent) if (busid_priv->udev->dev.parent)
...@@ -209,11 +209,9 @@ static int do_rebind(char *busid, struct bus_id_priv *busid_priv) ...@@ -209,11 +209,9 @@ static int do_rebind(char *busid, struct bus_id_priv *busid_priv)
ret = device_attach(&busid_priv->udev->dev); ret = device_attach(&busid_priv->udev->dev);
if (busid_priv->udev->dev.parent) if (busid_priv->udev->dev.parent)
device_unlock(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"); dev_err(&busid_priv->udev->dev, "rebind failed\n");
return ret; return ret;
}
return 0;
} }
static void stub_device_rebind(void) static void stub_device_rebind(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment