From 4509a010fb31c19bdbb3b84af9b2f31a2941b4a0 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Wed, 9 Nov 2005 01:35:03 -0500 Subject: [PATCH] --- yaml --- r: 29346 b: refs/heads/master c: fb2a26b9f8f5eda6b96ba9753edf105e5999d6d9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b5acc89d0408..50b153a211bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07f6f7d074e68d56d82e7cc5c65096033ac8dc56 +refs/heads/master: fb2a26b9f8f5eda6b96ba9753edf105e5999d6d9 diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index 59a4a26bc13f..3f9b53cc5d12 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -1145,7 +1145,7 @@ static void ata_dev_identify(struct ata_port *ap, unsigned int device) * ATA software reset (SRST, the default) does not appear * to have this problem. */ - if ((using_edd) && (qc->tf.command == ATA_CMD_ID_ATA)) { + if ((using_edd) && (dev->class == ATA_DEV_ATA)) { u8 err = qc->tf.feature; if (err & ATA_ABORTED) { dev->class = ATA_DEV_ATAPI; @@ -2756,7 +2756,6 @@ static unsigned long ata_pio_poll(struct ata_port *ap) u8 status; unsigned int poll_state = HSM_ST_UNKNOWN; unsigned int reg_state = HSM_ST_UNKNOWN; - const unsigned int tmout_state = HSM_ST_TMOUT; switch (ap->hsm_task_state) { case HSM_ST: @@ -2777,7 +2776,7 @@ static unsigned long ata_pio_poll(struct ata_port *ap) status = ata_chk_status(ap); if (status & ATA_BUSY) { if (time_after(jiffies, ap->pio_task_timeout)) { - ap->hsm_task_state = tmout_state; + ap->hsm_task_state = HSM_ST_TMOUT; return 0; } ap->hsm_task_state = poll_state;