Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

[karo-tx-linux.git] / drivers / video / cirrusfb.c

diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 97db3ba8f2377d8cd66c677e68703d03255f76fe..5aab9b9dc2109be565005d77cbfed962046434b3 100644 (file)
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -595,11 +595,6 @@ static int cirrusfb_check_var(struct fb_var_screeninfo *var,
                return -EINVAL;
        }
 
-       if (var->xoffset < 0)
-               var->xoffset = 0;
-       if (var->yoffset < 0)
-               var->yoffset = 0;
-
        /* truncate xoffset and yoffset to maximum if too high */
        if (var->xoffset > var->xres_virtual - var->xres)
                var->xoffset = var->xres_virtual - var->xres - 1;
@@ -2159,7 +2154,6 @@ static int cirrusfb_pci_register(struct pci_dev *pdev,
        if (!ret)
                return 0;
 
-       pci_set_drvdata(pdev, NULL);
        iounmap(info->screen_base);
 err_release_legacy:
        if (release_io_ports)