Merge tag 'fbdev-fixes-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux

80fc2f7f · Linus Torvalds <[email protected]> · 2016-11-15 08:28:59 -08:00

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

Commit: 80fc2f7fd8dece7bfa9b5b5dafb8705bbcefa6b4
Parents: e76d21c4 · cfbd950d

Merge commit. Changes below are compared with the first parent: e76d21c4.

Changes

1 files changed · +2 −2

File	Status	Add	Del	Content
drivers/video/fbdev/amba-clcd-versatile.c	modified	+2	−2	View file

drivers/video/fbdev/amba-clcd-versatile.c

View file

diff --git a/drivers/video/fbdev/amba-clcd-versatile.c b/drivers/video/fbdev/amba-clcd-versatile.c
index 19ad864..e5d9bfc 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;
 