diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-04-07 10:22:31 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-04-07 10:22:43 +1000 |
| commit | 691b592abb9a5f2b331969393bc06fcc8b564d3c (patch) | |
| tree | 0a29f7d2e69d2877e4ed938d0e5a1b532e7b3930 /drivers/gpu | |
| parent | 72cfb835e56f0eec18f934095fc1a52df1815f0c (diff) | |
| parent | d14eb80e27795b7b20060f7b151cdfe39722a813 (diff) | |
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
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c index a07ef26234e5..6826f4d4826a 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); |