]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
clk: sunxi-ng: de2: fix wrong pointer passed to PTR_ERR()
authorWei Yongjun <weiyongjun1@huawei.com>
Thu, 18 May 2017 15:55:13 +0000 (15:55 +0000)
committerMaxime Ripard <maxime.ripard@free-electrons.com>
Wed, 7 Jun 2017 13:32:14 +0000 (15:32 +0200)
PTR_ERR should access the value just tested by IS_ERR, otherwise
the wrong error code will be returned.

Fixes: b0d9a4bd52bd ("clk: sunxi-ng: add support for DE2 CCU")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
drivers/clk/sunxi-ng/ccu-sun8i-de2.c

index 15aaa9c4a3af6b906c2c196af2e850832a2c57d6..5cdaf52669e443de01829f699bd72231db6bbf05 100644 (file)
@@ -184,7 +184,7 @@ static int sunxi_de2_clk_probe(struct platform_device *pdev)
 
        rstc = devm_reset_control_get_exclusive(&pdev->dev, NULL);
        if (IS_ERR(rstc)) {
-               ret = PTR_ERR(bus_clk);
+               ret = PTR_ERR(rstc);
                if (ret != -EPROBE_DEFER)
                        dev_err(&pdev->dev,
                                "Couldn't get reset control: %d\n", ret);