diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-15 08:28:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-15 08:28:59 -0800 |
| commit | 80fc2f7fd8dece7bfa9b5b5dafb8705bbcefa6b4 (patch) | |
| tree | 76e23158f4acb7a63924704fdb609e54274ea8a3 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | video: ARM CLCD: fix Vexpress regression (diff) | |
| download | wireguard-linux-80fc2f7fd8dece7bfa9b5b5dafb8705bbcefa6b4.tar.xz wireguard-linux-80fc2f7fd8dece7bfa9b5b5dafb8705bbcefa6b4.zip | |
Merge tag 'fbdev-fixes-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux
Pull fbdev fix from Tomi Valkeinen:
"Fix CLCD regression on Vexpress"
* tag 'fbdev-fixes-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
video: ARM CLCD: fix Vexpress regression
| -rw-r--r-- | drivers/video/fbdev/amba-clcd-versatile.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/amba-clcd-versatile.c b/drivers/video/fbdev/amba-clcd-versatile.c index 19ad8645d93c..e5d9bfc1703a 100644 --- a/drivers/video/fbdev/amba-clcd-versatile.c +++ b/drivers/video/fbdev/amba-clcd-versatile.c @@ -526,8 +526,8 @@ int versatile_clcd_init_panel(struct clcd_fb *fb, np = of_find_matching_node_and_match(NULL, versatile_clcd_of_match, &clcd_id); if (!np) { - dev_err(dev, "no Versatile syscon node\n"); - return -ENODEV; + /* Vexpress does not have this */ + return 0; } versatile_clcd_type = (enum versatile_clcd)clcd_id->data; |