From: Hannes Reinecke <hare@suse.de>
Date: Fri, 13 Jun 2014 12:01:45 +0000 (+0200)
Subject: scsi_error: set DID_TIME_OUT correctly
X-Git-Tag: omap-for-v3.17/soc-cleanup~5^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a33c070bced8b283e22e8dbae35177a033b810bf;p=pandora-kernel.git

scsi_error: set DID_TIME_OUT correctly

Any callbacks in scsi_timeout_out() might return BLK_EH_RESET_TIMER,
in which case we should leave the result alone and not set
DID_TIME_OUT, as the command didn't actually timeout.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
---

Reading git-diff-tree failed