summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-12-17 02:54:42 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-12-29 10:06:55 +0200
commit811174f45f5c586569f0574ef7ff8904d5b05420 (patch)
tree0b472e6af3cb4a6a2cf48f90c5da2fa31fa5e6bc /drivers
parent1616cf01a4455501836fee506ed340baa571b366 (diff)
OMAPDSS: pll: NULL dereference in error handling
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/fbdev/omap2/dss/pll.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/fbdev/omap2/dss/pll.c b/drivers/video/fbdev/omap2/dss/pll.c
index 50bc62c5d367..335ffac224b9 100644
--- a/drivers/video/fbdev/omap2/dss/pll.c
+++ b/drivers/video/fbdev/omap2/dss/pll.c
@@ -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;