drivers/video: release mutex in error handling code

[linux-2.6-omap-h63xx.git] / drivers / video / vt8623fb.c

diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 66305b604ba8453fc4142d2ed7daa9d0fc742a04..4a484ee98f8a5e1af8bbe355bbe7ed5d37593311 100644 (file)
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -112,6 +112,8 @@ MODULE_DESCRIPTION("fbdev driver for integrated graphics core in VIA VT8623 [CLE
 
 module_param(mode_option, charp, 0644);
 MODULE_PARM_DESC(mode_option, "Default video mode ('640x480-8@60', etc)");
+module_param_named(mode, mode_option, charp, 0);
+MODULE_PARM_DESC(mode, "Default video mode e.g. '648x480-8@60' (deprecated)");
 
 #ifdef CONFIG_MTRR
 module_param(mtrr, int, 0444);
@@ -434,6 +436,10 @@ static int vt8623fb_set_par(struct fb_info *info)
        svga_wcrt_multi(vt8623_offset_regs, offset_value);
        svga_wseq_multi(vt8623_fetch_count_regs, fetch_value);
 
+       /* Clear H/V Skew */
+       svga_wcrt_mask(0x03, 0x00, 0x60);
+       svga_wcrt_mask(0x05, 0x00, 0x60);
+
        if (info->var.vmode & FB_VMODE_DOUBLE)
                svga_wcrt_mask(0x09, 0x80, 0x80);
        else
@@ -655,7 +661,7 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
        }
 
        /* Allocate and fill driver data structure */
-       info = framebuffer_alloc(sizeof(struct vt8623fb_info), NULL);
+       info = framebuffer_alloc(sizeof(struct vt8623fb_info), &(dev->dev));
        if (! info) {
                dev_err(&(dev->dev), "cannot allocate memory\n");
                return -ENOMEM;
@@ -671,13 +677,13 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
 
        rc = pci_enable_device(dev);
        if (rc < 0) {
-               dev_err(&(dev->dev), "cannot enable PCI device\n");
+               dev_err(info->dev, "cannot enable PCI device\n");
                goto err_enable_device;
        }
 
        rc = pci_request_regions(dev, "vt8623fb");
        if (rc < 0) {
-               dev_err(&(dev->dev), "cannot reserve framebuffer region\n");
+               dev_err(info->dev, "cannot reserve framebuffer region\n");
                goto err_request_regions;
        }
 
@@ -690,14 +696,14 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
        info->screen_base = pci_iomap(dev, 0, 0);
        if (! info->screen_base) {
                rc = -ENOMEM;
-               dev_err(&(dev->dev), "iomap for framebuffer failed\n");
+               dev_err(info->dev, "iomap for framebuffer failed\n");
                goto err_iomap_1;
        }
 
        par->mmio_base = pci_iomap(dev, 1, 0);
        if (! par->mmio_base) {
                rc = -ENOMEM;
-               dev_err(&(dev->dev), "iomap for MMIO failed\n");
+               dev_err(info->dev, "iomap for MMIO failed\n");
                goto err_iomap_2;
        }
 
@@ -708,7 +714,7 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
        if ((16 <= memsize1) && (memsize1 <= 64) && (memsize1 == memsize2))
                info->screen_size = memsize1 << 20;
        else {
-               dev_err(&(dev->dev), "memory size detection failed (%x %x), suppose 16 MB\n", memsize1, memsize2);
+               dev_err(info->dev, "memory size detection failed (%x %x), suppose 16 MB\n", memsize1, memsize2);
                info->screen_size = 16 << 20;
        }
 
@@ -725,19 +731,19 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
        rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
        if (! ((rc == 1) || (rc == 2))) {
                rc = -EINVAL;
-               dev_err(&(dev->dev), "mode %s not found\n", mode_option);
+               dev_err(info->dev, "mode %s not found\n", mode_option);
                goto err_find_mode;
        }
 
        rc = fb_alloc_cmap(&info->cmap, 256, 0);
        if (rc < 0) {
-               dev_err(&(dev->dev), "cannot allocate colormap\n");
+               dev_err(info->dev, "cannot allocate colormap\n");
                goto err_alloc_cmap;
        }
 
        rc = register_framebuffer(info);
        if (rc < 0) {
-               dev_err(&(dev->dev), "cannot register framebugger\n");
+               dev_err(info->dev, "cannot register framebugger\n");
                goto err_reg_fb;
        }
 
@@ -811,7 +817,7 @@ static int vt8623_pci_suspend(struct pci_dev* dev, pm_message_t state)
        struct fb_info *info = pci_get_drvdata(dev);
        struct vt8623fb_info *par = info->par;
 
-       dev_info(&(dev->dev), "suspend\n");
+       dev_info(info->dev, "suspend\n");
 
        acquire_console_sem();
        mutex_lock(&(par->open_lock));
@@ -842,16 +848,13 @@ static int vt8623_pci_resume(struct pci_dev* dev)
        struct fb_info *info = pci_get_drvdata(dev);
        struct vt8623fb_info *par = info->par;
 
-       dev_info(&(dev->dev), "resume\n");
+       dev_info(info->dev, "resume\n");
 
        acquire_console_sem();
        mutex_lock(&(par->open_lock));
 
-       if (par->ref_count == 0) {
-               mutex_unlock(&(par->open_lock));
-               release_console_sem();
-               return 0;
-       }
+       if (par->ref_count == 0)
+               goto fail;
 
        pci_set_power_state(dev, PCI_D0);
        pci_restore_state(dev);
@@ -864,8 +867,8 @@ static int vt8623_pci_resume(struct pci_dev* dev)
        vt8623fb_set_par(info);
        fb_set_suspend(info, 0);
 
-       mutex_unlock(&(par->open_lock));
 fail:
+       mutex_unlock(&(par->open_lock));
        release_console_sem();
 
        return 0;