Skip to content

Commit 691b592

Browse files
committed
Merge tag 'drm-misc-fixes-2022-03-24' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
* drm/panel/ili9341: Fix optional regulator handling Signed-off-by: Dave Airlie <airlied@redhat.com> From: Thomas Zimmermann <tzimmermann@suse.de> Link: https://patchwork.freedesktop.org/patch/msgid/YjwkvPp6UnePy4Q8@linux-uq9g.fritz.box
2 parents 72cfb83 + d14eb80 commit 691b592

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)