diff options
| author | Antonino A. Daplas <adaplas@gmail.com> | 2006-06-26 00:27:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 09:58:32 -0700 |
| commit | a06630f3e7fb29f2524e1d7b009eb8b5a278ba23 (patch) | |
| tree | da80382cdbdda004fff12484281a3ddbad0069b3 /drivers/video/nvidia/nvidia.c | |
| parent | 1c8ce271fe707d26b7bca4e490067fe65694b363 (diff) | |
| download | kernel_samsung_aries-a06630f3e7fb29f2524e1d7b009eb8b5a278ba23.zip kernel_samsung_aries-a06630f3e7fb29f2524e1d7b009eb8b5a278ba23.tar.gz kernel_samsung_aries-a06630f3e7fb29f2524e1d7b009eb8b5a278ba23.tar.bz2 | |
[PATCH] Detaching fbcon: remove calls to pci_disable_device()
Detaching fbcon allows individual drivers to be unloaded. However several
drivers call pci_disable_device() upon exit. This function will disable the
BAR's which will kill VGA text mode and/or affect X/DRM.
To prevent this, remove calls to pci_disable_device() from several drivers.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/nvidia/nvidia.c')
| -rw-r--r-- | drivers/video/nvidia/nvidia.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/video/nvidia/nvidia.c b/drivers/video/nvidia/nvidia.c index 65733e8..7b5cffb 100644 --- a/drivers/video/nvidia/nvidia.c +++ b/drivers/video/nvidia/nvidia.c @@ -1219,7 +1219,7 @@ static int __devinit nvidiafb_probe(struct pci_dev *pd, if (pci_request_regions(pd, "nvidiafb")) { printk(KERN_ERR PFX "cannot request PCI regions\n"); - goto err_out_request; + goto err_out_enable; } par->FlatPanel = flatpanel; @@ -1338,10 +1338,8 @@ err_out_free_base1: nvidia_delete_i2c_busses(par); err_out_arch: iounmap(par->REGS); -err_out_free_base0: + err_out_free_base0: pci_release_regions(pd); -err_out_request: - pci_disable_device(pd); err_out_enable: kfree(info->pixmap.addr); err_out_kfree: @@ -1371,7 +1369,6 @@ static void __exit nvidiafb_remove(struct pci_dev *pd) nvidia_delete_i2c_busses(par); iounmap(par->REGS); pci_release_regions(pd); - pci_disable_device(pd); kfree(info->pixmap.addr); framebuffer_release(info); pci_set_drvdata(pd, NULL); |