These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / host / ehci-st.c

diff --git a/kernel/drivers/usb/host/ehci-st.c b/kernel/drivers/usb/host/ehci-st.c
index 7e4bd39..b7c5cfa 100644 (file)
--- a/kernel/drivers/usb/host/ehci-st.c
+++ b/kernel/drivers/usb/host/ehci-st.c
@@ -54,7 +54,6 @@ static int st_ehci_platform_reset(struct usb_hcd *hcd)
        struct platform_device *pdev = to_platform_device(hcd->self.controller);
        struct usb_ehci_pdata *pdata = dev_get_platdata(&pdev->dev);
        struct ehci_hcd *ehci = hcd_to_ehci(hcd);
-       int retval;
        u32 threshold;
 
        /* Set EHCI packet buffer IN/OUT threshold to 128 bytes */
@@ -62,11 +61,7 @@ static int st_ehci_platform_reset(struct usb_hcd *hcd)
        writel(threshold, hcd->regs + AHB2STBUS_INSREG01);
 
        ehci->caps = hcd->regs + pdata->caps_offset;
-       retval = ehci_setup(hcd);
-       if (retval)
-               return retval;
-
-       return 0;
+       return ehci_setup(hcd);
 }
 
 static int st_ehci_platform_power_on(struct platform_device *dev)