From b5f1abb51b7028862e5923a848179a335422fa37 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Sat, 21 Jul 2012 17:27:08 +0000 Subject: 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. --- drkaiser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drkaiser.c') diff --git a/drkaiser.c b/drkaiser.c index a3844b8..259530a 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); -- cgit v1.1