Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / usb / host / oxu210hp-hcd.c

diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index 6352f54e65a1d9359f999a26aa6f12cea08f877d..fe3bd1cb8b6bd9dcd82071fb9c98a0ae66fc1836 100644 (file)
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -2670,7 +2670,6 @@ static int oxu_hcd_init(struct usb_hcd *hcd)
 static int oxu_reset(struct usb_hcd *hcd)
 {
        struct oxu_hcd *oxu = hcd_to_oxu(hcd);
-       int ret;
 
        spin_lock_init(&oxu->mem_lock);
        INIT_LIST_HEAD(&oxu->urb_list);
@@ -2696,11 +2695,7 @@ static int oxu_reset(struct usb_hcd *hcd)
        oxu->hcs_params = readl(&oxu->caps->hcs_params);
        oxu->sbrn = 0x20;
 
-       ret = oxu_hcd_init(hcd);
-       if (ret)
-               return ret;
-
-       return 0;
+       return oxu_hcd_init(hcd);
 }
 
 static int oxu_run(struct usb_hcd *hcd)