diff --git a/[refs] b/[refs]
index 9daa49f3f451..b14a65ab253f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29982e9acd3e81a289c73321401427d02eaa8adc
+refs/heads/master: 204abf28679cd55a8e254b18965583bb1c8bc739
diff --git a/trunk/drivers/scsi/esp_scsi.c b/trunk/drivers/scsi/esp_scsi.c
index ec71061aef61..71caf2ded6ba 100644
--- a/trunk/drivers/scsi/esp_scsi.c
+++ b/trunk/drivers/scsi/esp_scsi.c
@@ -2033,6 +2033,7 @@ static void esp_reset_cleanup(struct esp *esp)
 			starget_for_each_device(tp->starget, NULL,
 						esp_clear_hold);
 	}
+	esp->flags &= ~ESP_FLAG_RESETTING;
 }
 
 /* Runs under host->lock */