vserver 1.9.3

[linux-2.6.git] / drivers / ide / pci / serverworks.c

diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index 3418232..510ca14 100644 (file)
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -777,8 +777,8 @@ static void __init init_setup_csb6 (struct pci_dev *dev, ide_pci_device_t *d)
                d->autodma = AUTODMA;
 #endif
 
-       d->channels = (((d->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE) ||
-                       (d->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2)) &&
+       d->channels = ((dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE ||
+                       dev->device == PCI_DEVICE_ID_SERVERWORKS_CSB6IDE2) &&
                       (!(PCI_FUNC(dev->devfn) & 1))) ? 1 : 2;
 
        ide_setup_pci_device(dev, d);
@@ -798,8 +798,6 @@ static int __devinit svwks_init_one(struct pci_dev *dev, const struct pci_device
 {
        ide_pci_device_t *d = &serverworks_chipsets[id->driver_data];
 
-       if (dev->device != d->device)
-               BUG();
        d->init_setup(dev, d);
        return 0;
 }
@@ -814,7 +812,7 @@ static struct pci_device_id svwks_pci_tbl[] = {
 MODULE_DEVICE_TABLE(pci, svwks_pci_tbl);
 
 static struct pci_driver driver = {
-       .name           = "Serverworks IDE",
+       .name           = "Serverworks_IDE",
        .id_table       = svwks_pci_tbl,
        .probe          = svwks_init_one,
 #if 0  /* FIXME: implement */