kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

libata: do not attempt to retrieve sense code twice

Browse source 
Do not call ata_request_sense() if the sense code is already
present.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
This commit is contained in:
Hannes Reinecke 2016-04-25 12:45:43 +02:00 committed by Tejun Heo
parent 698f6700a6
commit d238ffd59d
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/ata/libata-eh.c
View file

@ -1660,7 +1660,7 @@ static void ata_eh_request_sense(struct ata_queued_cmd *qc,
return; return;
} }
if (!cmd) if (!cmd || qc->flags & ATA_QCFLAG_SENSE_VALID)
return; return;
if (!ata_id_sense_reporting_enabled(dev->id)) { if (!ata_id_sense_reporting_enabled(dev->id)) {
@ -1849,7 +1849,7 @@ void ata_eh_analyze_ncq_error(struct ata_link *link)
memcpy(&qc->result_tf, &tf, sizeof(tf)); memcpy(&qc->result_tf, &tf, sizeof(tf));
qc->result_tf.flags = ATA_TFLAG_ISADDR | ATA_TFLAG_LBA | ATA_TFLAG_LBA48; qc->result_tf.flags = ATA_TFLAG_ISADDR | ATA_TFLAG_LBA | ATA_TFLAG_LBA48;
qc->err_mask |= AC_ERR_DEV | AC_ERR_NCQ; qc->err_mask |= AC_ERR_DEV | AC_ERR_NCQ;
if (qc->result_tf.auxiliary) { if ((qc->result_tf.command & ATA_SENSE) || qc->result_tf.auxiliary) {
char sense_key, asc, ascq; char sense_key, asc, ascq;
sense_key = (qc->result_tf.auxiliary >> 16) & 0xff; sense_key = (qc->result_tf.auxiliary >> 16) & 0xff;