From: Tejun Heo  <htejun@gmail.com>
Date: Fri, 13 May 2005 15:46:13 +0000 (+0900)
Subject: [SCSI] remove unnecessary scsi_delete_timer() call in scsi_reset_provider()
X-Git-Tag: firefly_0821_release~40856^2~21^2~234^2^2~27^2~17
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0155a37ea5459f5bf1113c6fa519f943ef77d730;p=firefly-linux-kernel-4.4.55.git

[SCSI] remove unnecessary scsi_delete_timer() call in scsi_reset_provider()

scsi_reset_provider() calls scsi_delete_timer() on exit which
isn't necessary.  Remove it.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 1a135f38e78d..f5195cda5ef1 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1870,7 +1870,6 @@ scsi_reset_provider(struct scsi_device *dev, int flag)
 		rtn = FAILED;
 	}
 
-	scsi_delete_timer(scmd);
 	scsi_next_command(scmd);
 	return rtn;
 }