Hi,
this patch fixes subvendor vs. subdevice and
makes my serial PCI card happy again.
Linus, please apply if you like.
Regards, Gunther
--- linux/drivers/char/serial.c-241-orig Sat Feb 3 13:00:53 2001
+++ linux/drivers/char/serial.c Sat Feb 3 13:31:33 2001
@@ -3845,7 +3845,6 @@
offset = board->first_uart_offset;
/* Timedia/SUNIX uses a mixture of BARs and offsets */
- /* Ugh, this is ugly as all hell --- TYT */
if(dev->vendor == PCI_VENDOR_ID_TIMEDIA ) /* 0x1409 */
switch(idx) {
case 0: base_idx=0;
@@ -4175,12 +4174,17 @@
for (i=0; timedia_data[i].num; i++) {
ids = timedia_data[i].ids;
for (j=0; ids[j]; j++) {
- if (pci_get_subvendor(dev) == ids[j]) {
+ if (pci_get_subdevice(dev) == ids[j]) {
board->num_ports = timedia_data[i].num;
+ printk("serial: Timedia/Sunix/Exsys PCI with %d ports (%x:%x)\n",
+ board->num_ports, pci_get_subvendor(dev),
+ pci_get_subdevice(dev));
return 0;
}
}
}
+ printk("serial: ignoring unknown Timedia/Sunix card (%x:%x)\n",
+ pci_get_subvendor(dev),pci_get_subdevice(dev));
return 0;
}