From 82ba96c7733fb773c78030a98dd0fd990bfe4099 Mon Sep 17 00:00:00 2001 From: Albert Lee Date: Tue, 23 May 2006 18:12:30 +0800 Subject: [PATCH] --- yaml --- r: 29457 b: refs/heads/master c: 1f3461a72619fcd70a0fcb563306c91f753b4620 h: refs/heads/master i: 29455: 0b7987da38d6186c5c2d509af345a7b1831c13ff v: v3 --- [refs] | 2 +- trunk/drivers/scsi/sata_mv.c | 2 +- trunk/drivers/scsi/sata_sx4.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4e4054f773d8..381ba6d52200 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c81e29b4aca2b2503238276219d97faaac994b4f +refs/heads/master: 1f3461a72619fcd70a0fcb563306c91f753b4620 diff --git a/trunk/drivers/scsi/sata_mv.c b/trunk/drivers/scsi/sata_mv.c index bfe817fc7520..eb5f8bcd03c1 100644 --- a/trunk/drivers/scsi/sata_mv.c +++ b/trunk/drivers/scsi/sata_mv.c @@ -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), diff --git a/trunk/drivers/scsi/sata_sx4.c b/trunk/drivers/scsi/sata_sx4.c index 70a695488291..e799ef35e9db 100644 --- a/trunk/drivers/scsi/sata_sx4.c +++ b/trunk/drivers/scsi/sata_sx4.c @@ -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 */