Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / drivers / video / wm8505fb.c

diff --git a/drivers/video/wm8505fb.c b/drivers/video/wm8505fb.c
index e37251b..96e34a5 100644 (file)
--- a/drivers/video/wm8505fb.c
+++ b/drivers/video/wm8505fb.c
@@ -88,7 +88,7 @@ static int wm8505fb_set_timing(struct fb_info *info)
        int v_start = info->var.upper_margin;
        int v_end = v_start + info->var.yres;
        int v_all = v_end + info->var.lower_margin;
-       int v_sync = info->var.vsync_len + 1;
+       int v_sync = info->var.vsync_len;
 
        writel(0, fbi->regbase + WMT_GOVR_TG);
 
@@ -291,7 +291,7 @@ static int __devinit wm8505fb_probe(struct platform_device *pdev)
                goto failed_fbi;
        }
 
-       res = request_mem_region(res->start, resource_size(res), "wm8505fb");
+       res = request_mem_region(res->start, resource_size(res), DRIVER_NAME);
        if (res == NULL) {
                dev_err(&pdev->dev, "failed to request I/O memory\n");
                ret = -EBUSY;