From c7225c148468fd9258f87e84ad532487c4c2463a Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 22 Feb 2003 18:48:15 -0800 Subject: [PATCH] [PATCH] Always re-read vendor for each function We should probably always read the vendor ID from each function rather than assuming that it is identical to function 0. --- drivers/pcmcia/cardbus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pcmcia/cardbus.c b/drivers/pcmcia/cardbus.c index c1cd169841238..a4199617134a8 100644 --- a/drivers/pcmcia/cardbus.c +++ b/drivers/pcmcia/cardbus.c @@ -263,9 +263,9 @@ int cb_alloc(socket_info_t * s) dev->sysdata = bus->sysdata; dev->dev.parent = bus->dev; dev->dev.bus = &pci_bus_type; - dev->devfn = i; - dev->vendor = vend; + + pci_read_config_word(dev, PCI_VENDOR_ID, &dev->vendor); pci_read_config_word(dev, PCI_DEVICE_ID, &dev->device); dev->hdr_type = hdr & 0x7f; dev->dma_mask = 0xffffffff; -- 2.53.0