Merge branch 'stable/for-jens-3.13-take-two' of git://git.kernel.org/pub/scm/linux...

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

diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c
index 977e27927a211ab0fffcd37087f90e0c0fa86e9f..22ad028bf123c2ca4bf9030049fea40f5910fc38 100644 (file)
--- a/drivers/video/sis/sis_main.c
+++ b/drivers/video/sis/sis_main.c
@@ -5994,7 +5994,6 @@ static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        if(!ivideo->sisvga_enabled) {
                if(pci_enable_device(pdev)) {
                        if(ivideo->nbridge) pci_dev_put(ivideo->nbridge);
-                       pci_set_drvdata(pdev, NULL);
                        framebuffer_release(sis_fb_info);
                        return -EIO;
                }
@@ -6211,7 +6210,6 @@ error_3:  vfree(ivideo->bios_abase);
                        pci_dev_put(ivideo->lpcdev);
                if(ivideo->nbridge)
                        pci_dev_put(ivideo->nbridge);
-               pci_set_drvdata(pdev, NULL);
                if(!ivideo->sisvga_enabled)
                        pci_disable_device(pdev);
                framebuffer_release(sis_fb_info);
@@ -6480,8 +6478,8 @@ error_3:  vfree(ivideo->bios_abase);
                                                                        "disabled");
 
 
-               printk(KERN_INFO "fb%d: %s frame buffer device version %d.%d.%d\n",
-                       sis_fb_info->node, ivideo->myid, VER_MAJOR, VER_MINOR, VER_LEVEL);
+               fb_info(sis_fb_info, "%s frame buffer device version %d.%d.%d\n",
+                       ivideo->myid, VER_MAJOR, VER_MINOR, VER_LEVEL);
 
                printk(KERN_INFO "sisfb: Copyright (C) 2001-2005 Thomas Winischhofer\n");
 
@@ -6523,8 +6521,6 @@ static void sisfb_remove(struct pci_dev *pdev)
                mtrr_del(ivideo->mtrr, ivideo->video_base, ivideo->video_size);
 #endif
 
-       pci_set_drvdata(pdev, NULL);
-
        /* If device was disabled when starting, disable
         * it when quitting.
         */