rz1000: set serialized flag only if mate interface exists

[powerpc.git] / drivers / ide / pci / rz1000.c

diff --git a/drivers/ide/pci/rz1000.c b/drivers/ide/pci/rz1000.c
index c4541e4..0d76af4 100644 (file)
--- a/drivers/ide/pci/rz1000.c
+++ b/drivers/ide/pci/rz1000.c
@@ -41,7 +41,8 @@ static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif)
                printk(KERN_INFO "%s: disabled chipset read-ahead "
                        "(buggy RZ1000/RZ1001)\n", hwif->name);
        } else {
-               hwif->serialized = 1;
+               if (hwif->mate)
+                       hwif->mate->serialized = hwif->serialized = 1;
                hwif->drives[0].no_unmask = 1;
                hwif->drives[1].no_unmask = 1;
                printk(KERN_INFO "%s: serialized, disabled unmasking "
@@ -52,8 +53,7 @@ static void __devinit init_hwif_rz1000 (ide_hwif_t *hwif)
 static ide_pci_device_t rz1000_chipset __devinitdata = {
        .name           = "RZ100x",
        .init_hwif      = init_hwif_rz1000,
-       .autodma        = NODMA,
-       .host_flags     = IDE_HFLAG_BOOTABLE,
+       .host_flags     = IDE_HFLAG_NO_DMA | IDE_HFLAG_BOOTABLE,
 };
 
 static int __devinit rz1000_init_one(struct pci_dev *dev, const struct pci_device_id *id)