Adaptec 1480b SlimSCSI vs hotplug

[Erik Andersen]

I recently came into posession of an Adaptec 1480 cardbus SCSI
adaptor.  Using kernel 2.4.18-pre7 this adaptor does not work
properly with hotplug.  I find that the following change allows
the hotplug driver to properly load the aic7xxx driver when a
hotplug "add" event occurs.  Removing the card, and then
re-inserting it fails to properly reinitialize the device (unless
the aic7xxx module has been manually unloaded in between), but
this happens with or without this patch.  At least with this
patch, the device will load in the first place.  Does this look
agreeable?

--- linux-2.4.18-pre7.orig/drivers/scsi/aic7xxx/aic7xxx_linux_pci.c	Tue Jan 29 05:20:08 2002
+++ linux/drivers/scsi/aic7xxx/aic7xxx_linux_pci.c	Tue Jan 29 05:20:08 2002
@@ -62,12 +62,12 @@
 /* We do our own ID filtering.  So, grab all SCSI storage class devices. */
 static struct pci_device_id ahc_linux_pci_id_table[] = {
 	{
-		0x9004, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
-		PCI_CLASS_STORAGE_SCSI << 8, 0xFFFF00, 0
+		PCI_VENDOR_ID_ADAPTEC, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+		((PCI_CLASS_STORAGE_SCSI << 8) | 0x00), ~0, 0
 	},
 	{
-		0x9005, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
-		PCI_CLASS_STORAGE_SCSI << 8, 0xFFFF00, 0
+		PCI_VENDOR_ID_ADAPTEC2, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+		((PCI_CLASS_STORAGE_SCSI << 8) | 0x00), ~0, 0
 	},
 	{ 0 }
 };

 -Erik

--
Erik B. Andersen             http://codepoet-consulting.com/
--This message was written using 73% post-consumer electrons--