[PATCH] [6/6] Always re-read vendor for each function

• Next message: Russell King: "[PATCH] [4/6] Remove pci_{read,write}[bwl]"
• Previous message: Russell King: "[PATCH] [3/6] Remove "fn" argument from read_cb_mem()"
• In reply to: Russell King: "[PATCH] [5/6] Remove stack allocation of struct pci_dev"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This patch appears not to be in 2.5.62, but applies cleanly.

Subject: [6/6] 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 files changed, 2 insertions, 2 deletions

diff -ur -x sa11* -x Kconfig -x Makefile orig/drivers/pcmcia/cardbus.c linux/drivers/pcmcia/cardbus.c
--- orig/drivers/pcmcia/cardbus.c Sun Feb 23 14:12:57 2003
+++ linux/drivers/pcmcia/cardbus.c Sun Feb 23 14:15:26 2003
@@ -263,9 +263,9 @@
                 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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

• Next message: Russell King: "[PATCH] [4/6] Remove pci_{read,write}[bwl]"
• Previous message: Russell King: "[PATCH] [3/6] Remove "fn" argument from read_cb_mem()"
• In reply to: Russell King: "[PATCH] [5/6] Remove stack allocation of struct pci_dev"
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

This archive was generated by hypermail 2b29 : Sun Feb 23 2003 - 22:00:38 EST