avr32: fix error return code
Convert a zero return value on error to a negative one, as returned elsewhere in the function. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ identifier ret; expression e1,e2; @@ ( if (\(ret < 0\|ret != 0\)) { ... return ret; } | ret = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // </smpl> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr> Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>
This commit is contained in:
parent
19583ca584
commit
686913aa9f
|
@ -190,14 +190,19 @@ static int __init hammerhead_usbh_init(void)
|
||||||
|
|
||||||
/* setup gclk0 to run from osc1 */
|
/* setup gclk0 to run from osc1 */
|
||||||
gclk = clk_get(NULL, "gclk0");
|
gclk = clk_get(NULL, "gclk0");
|
||||||
if (IS_ERR(gclk))
|
if (IS_ERR(gclk)) {
|
||||||
|
ret = PTR_ERR(gclk);
|
||||||
goto err_gclk;
|
goto err_gclk;
|
||||||
|
}
|
||||||
|
|
||||||
osc = clk_get(NULL, "osc1");
|
osc = clk_get(NULL, "osc1");
|
||||||
if (IS_ERR(osc))
|
if (IS_ERR(osc)) {
|
||||||
|
ret = PTR_ERR(osc);
|
||||||
goto err_osc;
|
goto err_osc;
|
||||||
|
}
|
||||||
|
|
||||||
if (clk_set_parent(gclk, osc)) {
|
ret = clk_set_parent(gclk, osc);
|
||||||
|
if (ret < 0) {
|
||||||
pr_debug("hammerhead: failed to set osc1 for USBH clock\n");
|
pr_debug("hammerhead: failed to set osc1 for USBH clock\n");
|
||||||
goto err_set_clk;
|
goto err_set_clk;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue