summaryrefslogtreecommitdiffstats
path: root/nicintel.c
diff options
context:
space:
mode:
authorCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2012-07-21 17:27:08 +0000
committerCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>2012-07-21 17:27:08 +0000
commitd6bb828b017eaf89d5a4c52803ebc0029725383b (patch)
tree722abce67e8d8864158ec9261405461a28e313b0 /nicintel.c
parent0b9af36772b655f4de118ddb296207b6ca49cb58 (diff)
downloadast2050-flashrom-d6bb828b017eaf89d5a4c52803ebc0029725383b.zip
ast2050-flashrom-d6bb828b017eaf89d5a4c52803ebc0029725383b.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. Corresponding to flashrom svn r1551. 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>
Diffstat (limited to 'nicintel.c')
-rw-r--r--nicintel.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/nicintel.c b/nicintel.c
index 813049c..1c6d409 100644
--- a/nicintel.c
+++ b/nicintel.c
@@ -64,7 +64,6 @@ static int nicintel_shutdown(void *data)
physunmap(nicintel_control_bar, NICINTEL_CONTROL_MEMMAP_SIZE);
physunmap(nicintel_bar, NICINTEL_MEMMAP_SIZE);
pci_cleanup(pacc);
- release_io_perms();
return 0;
}
@@ -73,9 +72,10 @@ int nicintel_init(void)
uintptr_t addr;
/* Needed only for PCI accesses on some platforms.
- * FIXME: Refactor that into get_mem_perms/get_io_perms/get_pci_perms?
+ * FIXME: Refactor that into get_mem_perms/rget_io_perms/get_pci_perms?
*/
- get_io_perms();
+ if (rget_io_perms())
+ return 1;
/* No need to check for errors, pcidev_init() will not return in case
* of errors.
@@ -118,7 +118,6 @@ error_out_unmap:
physunmap(nicintel_bar, NICINTEL_MEMMAP_SIZE);
error_out:
pci_cleanup(pacc);
- release_io_perms();
return 1;
}
OpenPOWER on IntegriCloud