]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
OMAPDSS: pll: NULL dereference in error handling
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 16 Dec 2014 23:54:42 +0000 (02:54 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 29 Dec 2014 08:06:55 +0000 (10:06 +0200)
The regulator_disable() doesn't accept NULL pointers.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
drivers/video/fbdev/omap2/dss/pll.c

index 50bc62c5d367f5586bf5431a16e2b4ec91599ca6..335ffac224b97a57b6abc043b74ae47601e27535 100644 (file)
@@ -97,7 +97,8 @@ int dss_pll_enable(struct dss_pll *pll)
        return 0;
 
 err_enable:
-       regulator_disable(pll->regulator);
+       if (pll->regulator)
+               regulator_disable(pll->regulator);
 err_reg:
        clk_disable_unprepare(pll->clkin);
        return r;