diff --git a/[refs] b/[refs]
index 70a0e5ec48d8..f6fe3db5faaa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21feb5ccd5d054b8a17fe86b1b5df1e16809df64
+refs/heads/master: 0155a37ea5459f5bf1113c6fa519f943ef77d730
diff --git a/trunk/drivers/scsi/scsi_error.c b/trunk/drivers/scsi/scsi_error.c
index 1a135f38e78d..f5195cda5ef1 100644
--- a/trunk/drivers/scsi/scsi_error.c
+++ b/trunk/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;
 }