summaryrefslogtreecommitdiffstats
path: root/nicintel_spi.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
commitb5f1abb51b7028862e5923a848179a335422fa37 (patch)
tree722abce67e8d8864158ec9261405461a28e313b0 /nicintel_spi.c
parentdcbddba9cdefcd95847853fc9146976768e15f6d (diff)
downloadflashrom-b5f1abb51b7028862e5923a848179a335422fa37.zip
flashrom-b5f1abb51b7028862e5923a848179a335422fa37.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 Binary file (standard input) matches Corresponding to flashrom svn r1551.
Diffstat (limited to 'nicintel_spi.c')
-rw-r--r--nicintel_spi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/nicintel_spi.c b/nicintel_spi.c
index 7a02cda..531576c 100644
--- a/nicintel_spi.c
+++ b/nicintel_spi.c
@@ -159,7 +159,6 @@ static int nicintel_spi_shutdown(void *data)
physunmap(nicintel_spibar, 4096);
pci_cleanup(pacc);
- release_io_perms();
return 0;
}
@@ -168,7 +167,8 @@ int nicintel_spi_init(void)
{
uint32_t tmp;
- get_io_perms();
+ if (rget_io_perms())
+ return 1;
io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_intel_spi);
OpenPOWER on IntegriCloud