From d6bb828b017eaf89d5a4c52803ebc0029725383b 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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Niklas Söderlund Acked-by: Michael Karcher --- satasii.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'satasii.c') diff --git a/satasii.c b/satasii.c index aae76f3..0bea942 100644 --- a/satasii.c +++ b/satasii.c @@ -62,7 +62,6 @@ static int satasii_shutdown(void *data) { physunmap(sii_bar, SATASII_MEMMAP_SIZE); pci_cleanup(pacc); - release_io_perms(); return 0; } @@ -71,7 +70,8 @@ int satasii_init(void) uint32_t addr; uint16_t reg_offset; - get_io_perms(); + if (rget_io_perms()) + return 1; pcidev_init(PCI_BASE_ADDRESS_0, satas_sii); -- cgit v1.1