diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-09 01:19:18 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-09 01:19:18 -0400 |
| commit | 3f066887595de490c411762ce58a31412b09e939 (patch) | |
| tree | a26e04a120ae71ae72910cbd85c52ceba40a3ffc /drivers/scsi | |
| parent | f4b5cc874158a139c091b3decd468929e10645e6 (diff) | |
| parent | 22aac0896b1b0b8cabaf00714c55dd12f25d5738 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/ata_piix.c | 4 | ||||
| -rw-r--r-- | drivers/scsi/libata-scsi.c | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c index 298e4643b96..5e8afc87698 100644 --- a/drivers/scsi/ata_piix.c +++ b/drivers/scsi/ata_piix.c @@ -567,8 +567,8 @@ static int piix_sata_prereset(struct ata_port *ap) present = 1; } - DPRINTK("ata%u: LEAVE, pcs=0x%x present_mask=0x%x\n", - ap->id, pcs, present_mask); + DPRINTK("ata%u: LEAVE, pcs=0x%x present=0x%x\n", + ap->id, pcs, present); if (!present) { ata_port_printk(ap, KERN_INFO, "SATA port has no device.\n"); diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 37ec0266143..d168e341366 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c @@ -2353,6 +2353,19 @@ static void atapi_qc_complete(struct ata_queued_cmd *qc) ata_gen_ata_desc_sense(qc); } + /* SCSI EH automatically locks door if sdev->locked is + * set. Sometimes door lock request continues to + * fail, for example, when no media is present. This + * creates a loop - SCSI EH issues door lock which + * fails and gets invoked again to acquire sense data + * for the failed command. + * + * If door lock fails, always clear sdev->locked to + * avoid this infinite loop. + */ + if (qc->cdb[0] == ALLOW_MEDIUM_REMOVAL) + qc->dev->sdev->locked = 0; + qc->scsicmd->result = SAM_STAT_CHECK_CONDITION; qc->scsidone(cmd); ata_qc_free(qc); |