[PATCH] drm/panel: ili9341: fix optional regulator handling

Daniel Vetter daniel at ffwll.ch
Fri Mar 18 10:09:34 UTC 2022


On Thu, Mar 17, 2022 at 11:55:37PM +0100, Daniel Mack wrote:
> If the optional regulator lookup fails, reset the pointer to NULL.
> Other functions such as mipi_dbi_poweron_reset_conditional() only do
> a NULL pointer check and will otherwise dereference the error pointer.
> 
> Fixes: 5a04227326b04c15 ("drm/panel: Add ilitek ili9341 panel driver")
> Signed-off-by: Daniel Mack <daniel at zonque.org>

Merged into drm-misc-fixes and added cc: stable.
-Daniel
> ---
>  drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
> index 2c3378a259b1..e1542451ef9d 100644
> --- a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
> +++ b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
> @@ -612,8 +612,10 @@ static int ili9341_dbi_probe(struct spi_device *spi, struct gpio_desc *dc,
>  	int ret;
>  
>  	vcc = devm_regulator_get_optional(dev, "vcc");
> -	if (IS_ERR(vcc))
> +	if (IS_ERR(vcc)) {
>  		dev_err(dev, "get optional vcc failed\n");
> +		vcc = NULL;
> +	}
>  
>  	dbidev = devm_drm_dev_alloc(dev, &ili9341_dbi_driver,
>  				    struct mipi_dbi_dev, drm);
> -- 
> 2.35.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch


More information about the dri-devel mailing list