X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Ffbsd-device.c;h=604c8f02189a02fc814171989ddfd9ccdc4d7bbd;hb=4c2b4b1bfa348ea22a22f4ca271bc13096ab3e78;hp=396ff1d66e77516275b1fc8da96efef7dd900688;hpb=8e9299e4dde0bb73f2d571dc6e3b522f88d5765d;p=pciutils.git diff --git a/lib/fbsd-device.c b/lib/fbsd-device.c index 396ff1d..604c8f0 100644 --- a/lib/fbsd-device.c +++ b/lib/fbsd-device.c @@ -160,7 +160,7 @@ fbsd_scan(struct pci_access *a) } static void -fbsd_fill_info(struct pci_dev *d, int flags) +fbsd_fill_info(struct pci_dev *d, unsigned int flags) { struct pci_conf_io conf; struct pci_bar_io bar; @@ -195,9 +195,9 @@ fbsd_fill_info(struct pci_dev *d, int flags) if (ioctl(d->access->fd, PCIOCGETCONF, &conf) < 0) { - if (errno == ENODEV) - return 0; - d->access->error("fbsd_fill_info: ioctl(PCIOCGETCONF) failed: %s", strerror(errno)); + if (errno != ENODEV) + d->access->error("fbsd_fill_info: ioctl(PCIOCGETCONF) failed: %s", strerror(errno)); + return; } if (want_fill(d, flags, PCI_FILL_IDENT)) @@ -207,7 +207,7 @@ fbsd_fill_info(struct pci_dev *d, int flags) } if (want_fill(d, flags, PCI_FILL_CLASS)) d->device_class = (match.pc_class << 8) | match.pc_subclass; - if (want_fill(d, flags PCI_FILL_BASES | PCI_FILL_SIZES)) + if (want_fill(d, flags, PCI_FILL_BASES | PCI_FILL_SIZES)) { d->rom_base_addr = 0; d->rom_size = 0; @@ -224,7 +224,7 @@ fbsd_fill_info(struct pci_dev *d, int flags) if (ioctl(d->access->fd, PCIOCGETBAR, &bar) < 0) { if (errno == ENODEV) - return 0; + return; if (errno == EINVAL) { d->base_addr[i] = 0;