Minor fix to put the ATA_FLAG_NO_ATAPI flag back.
Signed-off-by: Albert Lee <albertcc@xxxxxxxxxx>
---
The ATA_FLAG_NO_ATAPI flag seems lost by auto merge.
In addtional to the lost ATA_FLAG_NO_ATAPI flag, there is a
extra if() block in sata_vsc.c which is not related to libata.
Maybe it is from somewhere else?
Patch against the libata-dev upstream branch
(b74ba22f030eb7ab88f7d8954ad18ecc0ac5ce3c).
diff -Nrup upstream0/drivers/scsi/sata_mv.c minor_fix/drivers/scsi/sata_mv.c
--- upstream0/drivers/scsi/sata_mv.c 2006-05-23 17:46:51.000000000 +0800
+++ minor_fix/drivers/scsi/sata_mv.c 2006-05-23 17:51:32.000000000 +0800
@@ -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 -Nrup upstream0/drivers/scsi/sata_sx4.c minor_fix/drivers/scsi/sata_sx4.c
--- upstream0/drivers/scsi/sata_sx4.c 2006-05-23 17:46:51.000000000 +0800
+++ minor_fix/drivers/scsi/sata_sx4.c 2006-05-23 17:52:10.000000000 +0800
@@ -218,7 +218,7 @@ static const struct ata_port_info pdc_po
.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 */
-
: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
