1 files changed, 13 insertions, 2 deletions

diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 346f257215a7..a1f2e7ce730b 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -954,6 +954,7 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
                         goto done;
 
                 if ((var->activate & FB_ACTIVATE_MASK) == FB_ACTIVATE_NOW) {
+                        struct fb_var_screeninfo old_var;
                         struct fb_videomode mode;
 
                         if (info->fbops->fb_get_caps) {
@@ -963,10 +964,20 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
                                         goto done;
                         }
 
+                        old_var = info->var;
                         info->var = *var;
 
-                        if (info->fbops->fb_set_par)
-                                info->fbops->fb_set_par(info);
+                        if (info->fbops->fb_set_par) {
+                                ret = info->fbops->fb_set_par(info);
+
+                                if (ret) {
+                                        info->var = old_var;
+                                        printk(KERN_WARNING "detected "
+                                                "fb_set_par error, "
+                                                "error code: %d\n", ret);
+                                        goto done;
+                                }
+                        }
 
                         fb_pan_display(info, &info->var);
                         fb_set_cmap(&info->cmap, info);