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 --- internal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'internal.c') diff --git a/internal.c b/internal.c index c99ca1f..bf1ca8c 100644 --- a/internal.c +++ b/internal.c @@ -159,7 +159,6 @@ enum chipbustype internal_buses_supported = BUS_NONE; static int internal_shutdown(void *data) { - release_io_perms(); return 0; } @@ -226,7 +225,8 @@ int internal_init(void) } free(arg); - get_io_perms(); + if (rget_io_perms()) + return 1; if (register_shutdown(internal_shutdown, NULL)) return 1; -- cgit v1.1