Commit 5d0c4393 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Greg Kroah-Hartman
Browse files

USB: hcd-pci: Use PCI_STD_NUM_BARS when checking standard BARs 



usb_hcd_pci_probe() searches for an I/O BAR using a combination of
PCI_STD_NUM_BARS (to control loop iteration) and PCI_ROM_RESOURCE (to check
whether the loop exits without finding anything).

Use PCI_STD_NUM_BARS consistently.

No functional change since PCI_STD_NUM_BARS == PCI_ROM_RESOURCE, but this
removes a dependency on that relationship and makes the code read better.

Fixes: c9c13ba4 ("PCI: Add PCI_STD_NUM_BARS for the number of standard BARs")
Cc: Denis Efremov <efremov@linux.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20220121183330.1141702-1-helgaas@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4213e92e

drivers/usb/core/hcd-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ int usb_hcd_pci_probe(struct pci_dev *dev, const struct pci_device_id *id, 
					hcd->rsrc_len, driver->description))

				break;

		}

		if (region == PCI_ROM_RESOURCE) {

		if (region == PCI_STD_NUM_BARS) {

			dev_dbg(&dev->dev, "no i/o regions available\n");

			retval = -EBUSY;

			goto put_hcd;