diff options
| author |   Albert Lee <albertcc@tw.ibm.com> | 2006-02-13 18:55:25 +0800 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@pobox.com> | 2006-02-17 16:29:07 -0500 |
| commit | 0565c26de7b2c069add553106f210b3128b67785 (patch) | |
| tree | ffd2bf8c07cbc69116d5a610a90831bc611baad4 /drivers | |
| parent | [PATCH] Necessary evil to get sata_vsc to initialize with Intel iq3124h hba (diff) | |
| download | linux-dev-0565c26de7b2c069add553106f210b3128b67785.tar.xz linux-dev-0565c26de7b2c069add553106f210b3128b67785.zip | |
[PATCH] libata: minor fix for 2.6.16-rc3
- Fix the array index value in ata_rwcmd_protocol() for the added FUA commands.
- Filter out ATAPI packet command error messages in ata_pio_error()
Signed-off-by: Albert Lee <albertcc@tw.ibm.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/libata-core.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 46c4cdbaee86..7ddd5a69352a 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -614,7 +614,7 @@ int ata_rwcmd_protocol(struct ata_queued_cmd *qc) } else if (lba48 && (qc->ap->flags & ATA_FLAG_PIO_LBA48)) { /* Unable to use DMA due to host limitation */ tf->protocol = ATA_PROT_PIO; - index = dev->multi_count ? 0 : 4; + index = dev->multi_count ? 0 : 8; } else { tf->protocol = ATA_PROT_DMA; index = 16; @@ -3357,11 +3357,12 @@ static void ata_pio_error(struct ata_port *ap) { struct ata_queued_cmd *qc; - printk(KERN_WARNING "ata%u: PIO error\n", ap->id); - qc = ata_qc_from_tag(ap, ap->active_tag); assert(qc != NULL); + if (qc->tf.command != ATA_CMD_PACKET) + printk(KERN_WARNING "ata%u: PIO error\n", ap->id); + /* make sure qc->err_mask is available to * know what's wrong and recover */ |