drm/panel: ili9341: fix optional regulator handling
Subsystems (3)
PATCH 1/1 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 5a04227326b04c15 ("drm/panel: Add ilitek ili9341 panel driver")
Signed-off-by Daniel Mack <[email protected]>
--- drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/panel/panel-ilitek-ili9341.c +3 -1
@@ -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);
Signature · 1 line
2.35.1
Daniel Vetter
AppliedQuoted 6 lines · Daniel Mack
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 <[email protected]>
Merged into drm-misc-fixes and added cc: stable.
-Daniel
Quoted 23 lines
--- drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/panel/panel-ilitek-ili9341.c +3
-1@@ -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);Signature · 1 line
2.35.1
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch