Merge branch 'master'

3 files changed, 18 insertions, 3 deletions

diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c
index 1147b899f007..007c8e9b2b39 100644
--- a/drivers/video/fbsysfs.c
+++ b/drivers/video/fbsysfs.c
@@ -242,6 +242,13 @@ static ssize_t show_virtual(struct class_device *class_device, char *buf)
                         fb_info->var.yres_virtual);
 }
 
+static ssize_t show_stride(struct class_device *class_device, char *buf)
+{
+        struct fb_info *fb_info =
+                (struct fb_info *)class_get_devdata(class_device);
+        return snprintf(buf, PAGE_SIZE, "%d\n", fb_info->fix.line_length);
+}
+
 /* Format for cmap is "%02x%c%4x%4x%4x\n" */
 /* %02x entry %c transp %4x red %4x blue %4x green \n */
 /* 256 rows at 16 chars equals 4096, the normal page size */
@@ -432,6 +439,7 @@ static struct class_device_attribute class_device_attrs[] = {
         __ATTR(pan, S_IRUGO|S_IWUSR, show_pan, store_pan),
         __ATTR(virtual_size, S_IRUGO|S_IWUSR, show_virtual, store_virtual),
         __ATTR(name, S_IRUGO, show_name, NULL),
+        __ATTR(stride, S_IRUGO, show_stride, NULL),
 };
 
 int fb_init_class_device(struct fb_info *fb_info)
diff --git a/drivers/video/logo/.gitignore b/drivers/video/logo/.gitignore
new file mode 100644
index 000000000000..e48355f538fa
--- /dev/null
+++ b/drivers/video/logo/.gitignore
@@ -0,0 +1,7 @@
+#
+# Generated files
+#
+*_mono.c
+*_vga16.c
+*_clut224.c
+*_gray256.c
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c
index 1ca80264c7b0..b1243da55fc5 100644
--- a/drivers/video/vesafb.c
+++ b/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);