Merge with git+ssh://git.ucw.cz/home/mj/GIT/pciutils.git

[pciutils.git] / lib / i386-ports.c

diff --git a/lib/i386-ports.c b/lib/i386-ports.c
index d491ad68320677c99f48dd42c1e73caafe072e4e..4b51c8818f097e67bbbe4e864fc82156c67e461e 100644 (file)
--- a/lib/i386-ports.c
+++ b/lib/i386-ports.c
@@ -27,17 +27,17 @@
 static int conf12_io_enabled = -1;             /* -1=haven't tried, 0=failed, 1=succeeded */
 
 static int
-conf12_setup_io(void)
+conf12_setup_io(struct pci_access *a)
 {
   if (conf12_io_enabled < 0)
-    conf12_io_enabled = intel_setup_io();
+    conf12_io_enabled = intel_setup_io(a);
   return conf12_io_enabled;
 }
 
 static void
 conf12_init(struct pci_access *a)
 {
-  if (!conf12_setup_io())
+  if (!conf12_setup_io(a))
     a->error("No permission to access I/O ports (you probably have to be root).");
 }
 
@@ -45,7 +45,7 @@ static void
 conf12_cleanup(struct pci_access *a UNUSED)
 {
   if (conf12_io_enabled > 0)
-    conf12_io_enabled = intel_cleanup_io();
+    conf12_io_enabled = intel_cleanup_io(a);
 }
 
 /*
@@ -95,7 +95,7 @@ conf1_detect(struct pci_access *a)
   unsigned int tmp;
   int res = 0;
 
-  if (!conf12_setup_io())
+  if (!conf12_setup_io(a))
     {
       a->debug("...no I/O permission");
       return 0;
@@ -172,7 +172,7 @@ conf1_write(struct pci_dev *d, int pos, byte *buf, int len)
 static int
 conf2_detect(struct pci_access *a)
 {
-  if (!conf12_setup_io())
+  if (!conf12_setup_io(a))
     {
       a->debug("...no I/O permission");
       return 0;