diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-18 19:38:09 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-18 19:38:09 +0200 |
commit | 4cc21505a09354ade787de368bd697a1bba3b213 (patch) | |
tree | 98a6a6348803ed92c8a2a2f15dd792f2bc886ef8 /drivers/scsi | |
parent | Fix signalfd interaction with thread-private signals (diff) | |
parent | [SCSI] ESP: Don't forget to clear ESP_FLAG_RESETTING. (diff) | |
download | linux-4cc21505a09354ade787de368bd697a1bba3b213.tar.xz linux-4cc21505a09354ade787de368bd697a1bba3b213.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] ESP: Don't forget to clear ESP_FLAG_RESETTING.
[SCSI] fusion: fix for BZ 8426 - massive slowdown on SCSI CD/DVD drive
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/esp_scsi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c index ec71061aef61..71caf2ded6ba 100644 --- a/drivers/scsi/esp_scsi.c +++ b/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 */ |