OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3c33840
)
drm/panel: ili9341: fix optional regulator handling
author
Daniel Mack
<daniel@zonque.org>
Thu, 17 Mar 2022 22:55:37 +0000
(23:55 +0100)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Fri, 18 Mar 2022 10:08:42 +0000
(11:08 +0100)
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@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
drivers/gpu/drm/panel/panel-ilitek-ili9341.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
index
2c3378a
..
e154245
100644
(file)
--- 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);