summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVille Syrjälä <ville.syrjala@linux.intel.com>2022-03-21 18:47:26 +0200
committerVille Syrjälä <ville.syrjala@linux.intel.com>2022-03-21 18:47:26 +0200
commit29e6a143ff0e6d0c868dfff95a13d96c30217cc5 (patch)
tree98275cea720aefbf203153f2f5cfa7a50cc66731
parentf443e374ae131c168a065ea1748feac6b2e76613 (diff)
parentd14eb80e27795b7b20060f7b151cdfe39722a813 (diff)
Merge remote-tracking branch 'drm_misc_push/drm-misc-fixes' into drm-tip
-rw-r--r--drivers/gpu/drm/panel/panel-ilitek-ili9341.c4
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 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);