diff mbox

fbdev: propagate result of fb_videomode_from_videomode()

Message ID 1434117559-32130-1-git-send-email-vladimir.murzin@arm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Vladimir Murzin June 12, 2015, 1:59 p.m. UTC 
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>
---
 drivers/video/fbdev/core/fbmon.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Tomi Valkeinen June 16, 2015, 7:07 a.m. UTC | #1 
On 12/06/15 16:59, Vladimir Murzin wrote:
> 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>
> ---
>  drivers/video/fbdev/core/fbmon.c |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
> index 01ef1b9..d787533 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);
> 

Thanks, queued for 4.2.

 Tomi
diff mbox

Patch

diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c
index 01ef1b9..d787533 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);