Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-3.10.git] / drivers / scsi / esp_scsi.c

diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index c1d50e669c4317bb5879c8eb0be7c5aeb3946190..77b06a983fa763023f245c010fb738616c7d18bc 100644 (file)
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -2029,6 +2029,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 */