summaryrefslogtreecommitdiff
path: root/gfxnvidia.c
diff options
context:
space:
mode:
authorhailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2012-07-21 17:27:08 +0000
committerhailfinger <hailfinger@2b7e53f0-3cfb-0310-b3e9-8179ed1497e1>2012-07-21 17:27:08 +0000
commit6610a35274f248e21e4142d9c3ec28f20877b14e (patch)
tree722abce67e8d8864158ec9261405461a28e313b0 /gfxnvidia.c
parentbe9509fb78af96c15947c861a482ad8d4c0315f8 (diff)
downloadflashrom-6610a35274f248e21e4142d9c3ec28f20877b14e.tar.gz
Automatically release I/O permissions on shutdown.
get_io_perms() is renamed to rget_io_perms() and automatically registers a function to release I/O permissions on shutdown. Actually release I/O permissions on Solaris and iopl()-supporting operating systems like Linux. This patch fixes quite a few programmers which forgot to release I/O permissions on shutdown, and it simplifies the shutdown and error handling code for all others. Do not call exit(1) if I/O permissions are denied and return an error instead. This part of the patch was written by Niklas Söderlund. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net> Signed-off-by: Niklas Söderlund <niso@kth.se> Acked-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de> git-svn-id: https://code.coreboot.org/svn/flashrom/trunk@1551 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'gfxnvidia.c')
-rw-r--r--gfxnvidia.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gfxnvidia.c b/gfxnvidia.c
index ddf82e7..782d692 100644
--- a/gfxnvidia.c
+++ b/gfxnvidia.c
@@ -84,7 +84,6 @@ static int gfxnvidia_shutdown(void *data)
* by PCI restore.
*/
pci_cleanup(pacc);
- release_io_perms();
return 0;
}
@@ -92,7 +91,8 @@ int gfxnvidia_init(void)
{
uint32_t reg32;
- get_io_perms();
+ if (rget_io_perms())
+ return 1;
io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, gfx_nvidia);