Skip to content

Commit d14eb80

Browse files
zonquedanvet
authored andcommitted
drm/panel: ili9341: fix optional regulator handling
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: 5a04227 ("drm/panel: Add ilitek ili9341 panel driver") Signed-off-by: Daniel Mack <daniel@zonque.org> Cc: stable@vger.kernel.org Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/20220317225537.826302-1-daniel@zonque.org
1 parent 3c33840 commit d14eb80

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/gpu/drm/panel/panel-ilitek-ili9341.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,8 +612,10 @@ static int ili9341_dbi_probe(struct spi_device *spi, struct gpio_desc *dc,
612612
int ret;
613613

614614
vcc = devm_regulator_get_optional(dev, "vcc");
615-
if (IS_ERR(vcc))
615+
if (IS_ERR(vcc)) {
616616
dev_err(dev, "get optional vcc failed\n");
617+
vcc = NULL;
618+
}
617619

618620
dbidev = devm_drm_dev_alloc(dev, &ili9341_dbi_driver,
619621
struct mipi_dbi_dev, drm);

0 commit comments

Comments
 (0)