aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladimir Murzin <vladimir.murzin@arm.com>2015-06-12 09:59:19 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-06-16 03:06:36 -0400
commit9f5ddefdc979d7b71aa4d3d7cc456c76fee80fda (patch)
tree527cfe5a5fa072c4f2da881d44241923521a6214
parent127b0c94cfa6e36c835adf6e27e056ff14818dc3 (diff)
fbdev: propagate result of fb_videomode_from_videomode()
fb_videomode_from_videomode() may fail, but of_get_fb_videomode() silently covers this fact. Instead, trow the error code to the caller. Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/fbdev/core/fbmon.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
index 01ef1b953390..d787533d9c8b 100644
--- a/drivers/video/fbdev/core/fbmon.c
+++ b/drivers/video/fbdev/core/fbmon.c
@@ -1475,7 +1475,9 @@ int of_get_fb_videomode(struct device_node *np, struct fb_videomode *fb,
1475 if (ret) 1475 if (ret)
1476 return ret; 1476 return ret;
1477 1477
1478 fb_videomode_from_videomode(&vm, fb); 1478 ret = fb_videomode_from_videomode(&vm, fb);
1479 if (ret)
1480 return ret;
1479 1481
1480 pr_debug("%s: got %dx%d display mode from %s\n", 1482 pr_debug("%s: got %dx%d display mode from %s\n",
1481 of_node_full_name(np), vm.hactive, vm.vactive, np->name); 1483 of_node_full_name(np), vm.hactive, vm.vactive, np->name);