]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
usb: host: ohci-pxa27x: Handle return value of clk_prepare_enable
authorArvind Yadav <arvind.yadav.cs@gmail.com>
Wed, 28 Jun 2017 04:51:28 +0000 (10:21 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Jun 2017 12:49:06 +0000 (14:49 +0200)
clk_prepare_enable() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ohci-pxa27x.c

index 79efde8f21e080571df68825981080f1663dd520..21c010ffb03ceea56cc4cd659aa0090a193a8e1c 100644 (file)
@@ -274,14 +274,16 @@ extern void pxa27x_clear_otgph(void);
 
 static int pxa27x_start_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev)
 {
-       int retval = 0;
+       int retval;
        struct pxaohci_platform_data *inf;
        uint32_t uhchr;
        struct usb_hcd *hcd = dev_get_drvdata(dev);
 
        inf = dev_get_platdata(dev);
 
-       clk_prepare_enable(pxa_ohci->clk);
+       retval = clk_prepare_enable(pxa_ohci->clk);
+       if (retval)
+               return retval;
 
        pxa27x_reset_hc(pxa_ohci);
 
@@ -296,8 +298,10 @@ static int pxa27x_start_hc(struct pxa27x_ohci *pxa_ohci, struct device *dev)
        if (inf->init)
                retval = inf->init(dev);
 
-       if (retval < 0)
+       if (retval < 0) {
+               clk_disable_unprepare(pxa_ohci->clk);
                return retval;
+       }
 
        if (cpu_is_pxa3xx())
                pxa3xx_u2d_start_hc(&hcd->self);