diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-18 13:38:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-18 13:38:09 -0400 |
| commit | 4cc21505a09354ade787de368bd697a1bba3b213 (patch) | |
| tree | 98a6a6348803ed92c8a2a2f15dd792f2bc886ef8 /drivers/scsi | |
| parent | caec4e8dc85e0644ec24aeb36285e1ba02da58cc (diff) | |
| parent | 204abf28679cd55a8e254b18965583bb1c8bc739 (diff) | |
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) | |||
| 2033 | starget_for_each_device(tp->starget, NULL, | 2033 | starget_for_each_device(tp->starget, NULL, |
| 2034 | esp_clear_hold); | 2034 | esp_clear_hold); |
| 2035 | } | 2035 | } |
| 2036 | esp->flags &= ~ESP_FLAG_RESETTING; | ||
| 2036 | } | 2037 | } |
| 2037 | 2038 | ||
| 2038 | /* Runs under host->lock */ | 2039 | /* Runs under host->lock */ |