X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fi386-ports.c;h=4b51c8818f097e67bbbe4e864fc82156c67e461e;hb=f548ecdbccf5effff1f6fb121bbd6a1e49659c5b;hp=d491ad68320677c99f48dd42c1e73caafe072e4e;hpb=9007a292f24685d7c1ab51506fae8df22ced007f;p=pciutils.git diff --git a/lib/i386-ports.c b/lib/i386-ports.c index d491ad6..4b51c88 100644 --- 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;