diff --git a/[refs] b/[refs]
index 22af65ad6ef7..7f4397e51eb2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d846a92e4ec26112fbe41c4e45ddd9119cd74cda
+refs/heads/master: bb7e257ef8d8ba43cab356aa1cc1b20d0106d45f
diff --git a/trunk/drivers/video/vesafb.c b/trunk/drivers/video/vesafb.c
index 1ca80264c7b0..b1243da55fc5 100644
--- a/trunk/drivers/video/vesafb.c
+++ b/trunk/drivers/video/vesafb.c
@@ -96,14 +96,14 @@ static int vesafb_blank(int blank, struct fb_info *info)
 		int loop = 10000;
 		u8 seq = 0, crtc17 = 0;
 
-		err = 0;
-
-		if (blank) {
+		if (blank == FB_BLANK_POWERDOWN) {
 			seq = 0x20;
 			crtc17 = 0x00;
+			err = 0;
 		} else {
 			seq = 0x00;
 			crtc17 = 0x80;
+			err = (blank == FB_BLANK_UNBLANK) ? 0 : -EINVAL;
 		}
 
 		vga_wseq(NULL, 0x00, 0x01);