aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/nvidia/nvidia.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/nvidia/nvidia.c')
-rw-r--r--drivers/video/nvidia/nvidia.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c
index d0ca0d89dd2a..d4f850117874 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -1299,20 +1299,19 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd,
1299 1299
1300 nvidia_save_vga(par, &par->SavedReg); 1300 nvidia_save_vga(par, &par->SavedReg);
1301 1301
1302 pci_set_drvdata(pd, info);
1303 nvidia_bl_init(par);
1302 if (register_framebuffer(info) < 0) { 1304 if (register_framebuffer(info) < 0) {
1303 printk(KERN_ERR PFX "error registering nVidia framebuffer\n"); 1305 printk(KERN_ERR PFX "error registering nVidia framebuffer\n");
1304 goto err_out_iounmap_fb; 1306 goto err_out_iounmap_fb;
1305 } 1307 }
1306 1308
1307 pci_set_drvdata(pd, info);
1308 1309
1309 printk(KERN_INFO PFX 1310 printk(KERN_INFO PFX
1310 "PCI nVidia %s framebuffer (%dMB @ 0x%lX)\n", 1311 "PCI nVidia %s framebuffer (%dMB @ 0x%lX)\n",
1311 info->fix.id, 1312 info->fix.id,
1312 par->FbMapSize / (1024 * 1024), info->fix.smem_start); 1313 par->FbMapSize / (1024 * 1024), info->fix.smem_start);
1313 1314
1314 nvidia_bl_init(par);
1315
1316 NVTRACE_LEAVE(); 1315 NVTRACE_LEAVE();
1317 return 0; 1316 return 0;
1318 1317