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 8e5b484db649..c18e9557ca30 100644
--- a/drivers/video/nvidia/nvidia.c
+++ b/drivers/video/nvidia/nvidia.c
@@ -938,8 +938,6 @@ static int nvidiafb_blank(int blank, struct fb_info *info)
938 NVWriteSeq(par, 0x01, tmp); 938 NVWriteSeq(par, 0x01, tmp);
939 NVWriteCrtc(par, 0x1a, vesa); 939 NVWriteCrtc(par, 0x1a, vesa);
940 940
941 nvidia_bl_set_power(info, blank);
942
943 NVTRACE_LEAVE(); 941 NVTRACE_LEAVE();
944 942
945 return 0; 943 return 0;
@@ -1352,9 +1350,10 @@ static void __devexit nvidiafb_remove(struct pci_dev *pd)
1352 1350
1353 NVTRACE_ENTER(); 1351 NVTRACE_ENTER();
1354 1352
1353 unregister_framebuffer(info);
1354
1355 nvidia_bl_exit(par); 1355 nvidia_bl_exit(par);
1356 1356
1357 unregister_framebuffer(info);
1358#ifdef CONFIG_MTRR 1357#ifdef CONFIG_MTRR
1359 if (par->mtrr.vram_valid) 1358 if (par->mtrr.vram_valid)
1360 mtrr_del(par->mtrr.vram, info->fix.smem_start, 1359 mtrr_del(par->mtrr.vram, info->fix.smem_start,