Re: [patch] OMAPDSS: pll: NULL dereference in error handling

From
Tomi Valkeinen <hidden>
Date
2014-12-17 06:28:56
Also in
kernel-janitors, linux-omap
Reply to
Dan Carpenter, 2014-12-16
On 17/12/14 01:54, Dan Carpenter wrote:
quoted hunk ↗ jump to hunk
The regulator_disable() doesn't accept NULL pointers.

Signed-off-by: Dan Carpenter <redacted>
diff --git a/drivers/video/fbdev/omap2/dss/pll.c b/drivers/video/fbdev/omap2/dss/pll.c
index 50bc62c5..335ffac 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;
Thanks! Queuing for 3.19 fbdev fixes.

 Tomi

Attachments

Thread (2 messages) 2 messages, 2 authors, last reply 2014-12-17
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help