projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge drm/drm-fixes into drm-misc-fixes
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
panel
/
panel-ilitek-ili9341.c
diff --git
a/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
b/drivers/gpu/drm/panel/panel-ilitek-ili9341.c
index
a07ef26
..
6826f4d
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);