drivers/usb/gadget/lpc32xx_udc.c: adjust inconsistent IS_ERR and PTR_ERR

JuliaLawall · gregkh · commit 1a35d9df80c0 · 2012-09-05T16:52:09.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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/usb/gadget/lpc32xx_udc.c b/drivers/usb/gadget/lpc32xx_udc.c
@@ -3208,7 +3208,7 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev)
 	udc->usb_otg_clk = clk_get(&pdev->dev, "ck_usb_otg");
 	if (IS_ERR(udc->usb_otg_clk)) {
 		dev_err(udc->dev, "failed to acquire USB otg clock\n");
-		retval = PTR_ERR(udc->usb_slv_clk);
+		retval = PTR_ERR(udc->usb_otg_clk);
 		goto usb_otg_clk_get_fail;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -3208,7 +3208,7 @@ static int __init lpc32xx_udc_probe(struct platform_device *pdev)`
`3208`	`3208`	`udc->usb_otg_clk = clk_get(&pdev->dev, "ck_usb_otg");`
`3209`	`3209`	`if (IS_ERR(udc->usb_otg_clk)) {`
`3210`	`3210`	`dev_err(udc->dev, "failed to acquire USB otg clock\n");`
`3211`		`- retval = PTR_ERR(udc->usb_slv_clk);`
	`3211`	`+ retval = PTR_ERR(udc->usb_otg_clk);`
`3212`	`3212`	`goto usb_otg_clk_get_fail;`
`3213`	`3213`	`}`
`3214`	`3214`