drivers/usb/host/ohci-nxp.c: adjust inconsistent IS_ERR and PTR_ERR
authorJulia Lawall <Julia.Lawall@lip6.fr>
Sat, 25 Aug 2012 19:57:07 +0000 (21:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Sep 2012 23:52:08 +0000 (16:52 -0700)
Change the call to PTR_ERR to access the value just tested by IS_ERR.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression e,e1;
@@

(
if (IS_ERR(e)) { ... PTR_ERR(e) ... }
|
if (IS_ERR(e=e1)) { ... PTR_ERR(e) ... }
|
*if (IS_ERR(e))
 { ...
*  PTR_ERR(e1)
   ... }
)
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/host/ohci-nxp.c

index a446386bf779208518b760ffcfb94cc346dc4f5b..c60066a636068addf10ad8b66539fd370ce6af71 100644 (file)
@@ -355,7 +355,7 @@ static int __devinit usb_hcd_nxp_probe(struct platform_device *pdev)
        usb_otg_clk = clk_get(&pdev->dev, "ck_usb_otg");
        if (IS_ERR(usb_otg_clk)) {
                dev_err(&pdev->dev, "failed to acquire USB DEV Clock\n");
-               ret = PTR_ERR(usb_dev_clk);
+               ret = PTR_ERR(usb_otg_clk);
                goto out6;
        }