diff options
| author | Vladimir Murzin | 2015-06-12 15:59:19 +0200 |
|---|---|---|
| committer | Tomi Valkeinen | 2015-06-16 09:06:36 +0200 |
| commit | 9f5ddefdc979d7b71aa4d3d7cc456c76fee80fda (patch) | |
| tree | 527cfe5a5fa072c4f2da881d44241923521a6214 | |
| parent | video: fbdev: vesafb: use arch_phys_wc_add() (diff) | |
| download | kernel-qcow2-linux-9f5ddefdc979d7b71aa4d3d7cc456c76fee80fda.tar.gz kernel-qcow2-linux-9f5ddefdc979d7b71aa4d3d7cc456c76fee80fda.tar.xz kernel-qcow2-linux-9f5ddefdc979d7b71aa4d3d7cc456c76fee80fda.zip | |
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.c | 4 |
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, if (ret) return ret; - fb_videomode_from_videomode(&vm, fb); + ret = fb_videomode_from_videomode(&vm, fb); + if (ret) + return ret; pr_debug("%s: got %dx%d display mode from %s\n", of_node_full_name(np), vm.hactive, vm.vactive, np->name); |