| Message ID | 20190612133038.5522-1-linus.walleij@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | drm/mcde: Fix uninitialized variable | expand |
On Wed, Jun 12, 2019 at 03:30:38PM +0200, Linus Walleij wrote: > We need to handle the case when of_drm_find_bridge() returns > NULL. > > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Cc: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > drivers/gpu/drm/mcde/mcde_drv.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c > index baf63fb6850a..bc11c446e594 100644 > --- a/drivers/gpu/drm/mcde/mcde_drv.c > +++ b/drivers/gpu/drm/mcde/mcde_drv.c > @@ -319,7 +319,7 @@ static int mcde_probe(struct platform_device *pdev) > struct device *dev = &pdev->dev; > struct drm_device *drm; > struct mcde *mcde; > - struct component_match *match; > + struct component_match *match = NULL; > struct resource *res; > u32 pid; > u32 val; > @@ -485,7 +485,7 @@ static int mcde_probe(struct platform_device *pdev) > } > put_device(p); > } > - if (IS_ERR(match)) { > + if (IS_ERR_OR_NULL(match)) { > dev_err(dev, "could not create component match\n"); > ret = PTR_ERR(match); This doesn't work. If "match" is NULL then "ret" is zero which is success. > goto clk_disable; regards, dan carpenter
diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c index baf63fb6850a..bc11c446e594 100644 --- a/drivers/gpu/drm/mcde/mcde_drv.c +++ b/drivers/gpu/drm/mcde/mcde_drv.c @@ -319,7 +319,7 @@ static int mcde_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct drm_device *drm; struct mcde *mcde; - struct component_match *match; + struct component_match *match = NULL; struct resource *res; u32 pid; u32 val; @@ -485,7 +485,7 @@ static int mcde_probe(struct platform_device *pdev) } put_device(p); } - if (IS_ERR(match)) { + if (IS_ERR_OR_NULL(match)) { dev_err(dev, "could not create component match\n"); ret = PTR_ERR(match); goto clk_disable;
We need to handle the case when of_drm_find_bridge() returns NULL. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Cc: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/gpu/drm/mcde/mcde_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)