Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / net / can / mscan / mpc5xxx_can.c

diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index b1bdc909090f7130ccf88cbb6e5257542623b9d2..312b9c8f4f3bdbcb5342b4aae732bde2a3307c70 100644 (file)
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -143,12 +143,12 @@ static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev,
        np_clock = of_find_matching_node(NULL, mpc512x_clock_ids);
        if (!np_clock) {
                dev_err(&ofdev->dev, "couldn't find clock node\n");
-               return -ENODEV;
+               return 0;
        }
        clockctl = of_iomap(np_clock, 0);
        if (!clockctl) {
                dev_err(&ofdev->dev, "couldn't map clock registers\n");
-               return 0;
+               goto exit_put;
        }
 
        /* Determine the MSCAN device index from the physical address */
@@ -233,9 +233,9 @@ static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev,
                clocksrc == 1 ? "ref_clk" : "sys_clk", clockdiv);
 
 exit_unmap:
-       of_node_put(np_clock);
        iounmap(clockctl);
-
+exit_put:
+       of_node_put(np_clock);
        return freq;
 }
 #else /* !CONFIG_PPC_MPC512x */