drivers/usb/host/ohci-nxp.c: adjust inconsistent IS_ERR and PTR_ERR

JuliaLawall · gregkh · commit 2ec15a6fbe93 · 2012-09-05T16:52:08.000-07:00
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>
diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c
@@ -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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ static int __devinit usb_hcd_nxp_probe(struct platform_device *pdev)`
`355`	`355`	`usb_otg_clk = clk_get(&pdev->dev, "ck_usb_otg");`
`356`	`356`	`if (IS_ERR(usb_otg_clk)) {`
`357`	`357`	`dev_err(&pdev->dev, "failed to acquire USB DEV Clock\n");`
`358`		`- ret = PTR_ERR(usb_dev_clk);`
	`358`	`+ ret = PTR_ERR(usb_otg_clk);`
`359`	`359`	`goto out6;`
`360`	`360`	`}`
`361`	`361`