[PATCH] libata: minor fix for irq-pio merge
authorAlbert Lee <albertcc@tw.ibm.com>
Tue, 23 May 2006 10:12:30 +0000 (18:12 +0800)
committerJeff Garzik <jeff@garzik.org>
Wed, 24 May 2006 05:50:04 +0000 (01:50 -0400)
Minor fix to put the ATA_FLAG_NO_ATAPI flag back.

Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/scsi/sata_mv.c
drivers/scsi/sata_sx4.c

index bfe817fc752001c180117ef96314d709f1bff4f9..eb5f8bcd03c1a8e5d33457a9198fec5d92379271 100644 (file)
@@ -93,7 +93,7 @@ enum {
        MV_FLAG_IRQ_COALESCE    = (1 << 29),  /* IRQ coalescing capability */
        MV_COMMON_FLAGS         = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                   ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO |
-                                  ATA_FLAG_PIO_POLLING),
+                                  ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING),
        MV_6XXX_FLAGS           = MV_FLAG_IRQ_COALESCE,
 
        CRQB_FLAG_READ          = (1 << 0),
index 70a695488291b33d179ec900448225dc8ec95e2a..e799ef35e9db828f935d08063ad7e8128e2a76e6 100644 (file)
@@ -218,7 +218,7 @@ static const struct ata_port_info pdc_port_info[] = {
                .sht            = &pdc_sata_sht,
                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
                                  ATA_FLAG_SRST | ATA_FLAG_MMIO |
-                                 ATA_FLAG_PIO_POLLING,
+                                 ATA_FLAG_NO_ATAPI | ATA_FLAG_PIO_POLLING,
                .pio_mask       = 0x1f, /* pio0-4 */
                .mwdma_mask     = 0x07, /* mwdma0-2 */
                .udma_mask      = 0x7f, /* udma0-6 ; FIXME */