From: Vishal Annapurve Subject: [PATCH] usb: storage: Proper cmd result assignment This change replaces DID_ABORT with DID_TIMEOUT from usb storage assuming that the command will get aborted only in case of timeout. Signed-off-by: Vishal Annapurve --- drivers/usb/storage/transport.c | 8 ++++---- drivers/usb/storage/usb.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c index b2697dc..f68e4c6 100644 --- a/drivers/usb/storage/transport.c +++ b/drivers/usb/storage/transport.c @@ -608,8 +608,8 @@ void usb_stor_invoke_transport(struct scsi_cmnd *srb, struct us_data *us) * short-circuit all other processing */ if (test_bit(US_FLIDX_TIMED_OUT, &us->dflags)) { - US_DEBUGP("-- command was aborted\n"); - srb->result = DID_ABORT << 16; + US_DEBUGP("-- command was aborted because of timeout\n"); + srb->result = DID_TIME_OUT << 16; goto Handle_Errors; } @@ -721,8 +721,8 @@ Retry_Sense: scsi_eh_restore_cmnd(srb, &ses); if (test_bit(US_FLIDX_TIMED_OUT, &us->dflags)) { - US_DEBUGP("-- auto-sense aborted\n"); - srb->result = DID_ABORT << 16; + US_DEBUGP("-- auto-sense aborted due to timeout\n"); + srb->result = DID_TIME_OUT << 16; /* If SANE_SENSE caused this problem, disable it */ if (sense_size != US_SENSE_SIZE) { diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c index c0d0915..263123b 100644 --- a/drivers/usb/storage/usb.c +++ b/drivers/usb/storage/usb.c @@ -290,7 +290,7 @@ static int usb_stor_control_thread(void * __us) /* has the command timed out *already* ? */ if (test_bit(US_FLIDX_TIMED_OUT, &us->dflags)) { - us->srb->result = DID_ABORT << 16; + us->srb->result = DID_TIME_OUT << 16; goto SkipForAbort; } @@ -344,18 +344,18 @@ static int usb_stor_control_thread(void * __us) scsi_lock(host); /* indicate that the command is done */ - if (us->srb->result != DID_ABORT << 16) { + if (us->srb->result != DID_TIME_OUT << 16) { US_DEBUGP("scsi cmd done, result=0x%x\n", us->srb->result); us->srb->scsi_done(us->srb); } else { SkipForAbort: - US_DEBUGP("scsi command aborted\n"); + US_DEBUGP("scsi command aborted due to timeout\n"); } /* If an abort request was received we need to signal that * the abort has finished. The proper test for this is - * the TIMED_OUT flag, not srb->result == DID_ABORT, because + * the TIMED_OUT flag, not srb->result == DID_TIME_OUT, because * the timeout might have occurred after the command had * already completed with a different result code. */ if (test_bit(US_FLIDX_TIMED_OUT, &us->dflags)) { -- 1.8.4