summaryrefslogtreecommitdiffstats
path: root/drkaiser.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 /drkaiser.c
parent0b9af36772b655f4de118ddb296207b6ca49cb58 (diff)
downloadflashrom-d6bb828b017eaf89d5a4c52803ebc0029725383b.tar.gz
flashrom-d6bb828b017eaf89d5a4c52803ebc0029725383b.tar.bz2
flashrom-d6bb828b017eaf89d5a4c52803ebc0029725383b.zip
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 'drkaiser.c')
-rw-r--r--drkaiser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drkaiser.c b/drkaiser.c
index a3844b82a..259530a5d 100644
--- a/drkaiser.c
+++ b/drkaiser.c
@@ -60,7 +60,6 @@ static int drkaiser_shutdown(void *data)
physunmap(drkaiser_bar, DRKAISER_MEMMAP_SIZE);
/* Flash write is disabled automatically by PCI restore. */
pci_cleanup(pacc);
- release_io_perms();
return 0;
};
@@ -68,7 +67,8 @@ int drkaiser_init(void)
{
uint32_t addr;
- get_io_perms();
+ if (rget_io_perms())
+ return 1;
addr = pcidev_init(PCI_BASE_ADDRESS_2, drkaiser_pcidev);