Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0565c26d authored by Albert Lee's avatar Albert Lee Committed by Jeff Garzik
Browse files

[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: default avatarAlbert Lee <albertcc@tw.ibm.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@pobox.com>
parent 2ae5b30f

drivers/scsi/libata-core.c

+4 −3
Original line number Diff line number Diff line
@@ -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

	 */