diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-20 10:11:25 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-20 10:11:25 -0400 |
| commit | 323cb3ce6eea9d4e72a81a9ffaac4c4e5b800810 (patch) | |
| tree | 01c9fc4f3d6757705d0c286da2aa153704c2a3bc /drivers/scsi | |
| parent | 59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/scsi_error.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index ad5342165079..52b348c36d56 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
| @@ -1645,6 +1645,8 @@ int scsi_error_handler(void *data) | |||
| 1645 | set_current_state(TASK_INTERRUPTIBLE); | 1645 | set_current_state(TASK_INTERRUPTIBLE); |
| 1646 | } | 1646 | } |
| 1647 | 1647 | ||
| 1648 | __set_current_state(TASK_RUNNING); | ||
| 1649 | |||
| 1648 | SCSI_LOG_ERROR_RECOVERY(1, printk("Error handler scsi_eh_%d" | 1650 | SCSI_LOG_ERROR_RECOVERY(1, printk("Error handler scsi_eh_%d" |
| 1649 | " exiting\n",shost->host_no)); | 1651 | " exiting\n",shost->host_no)); |
| 1650 | 1652 | ||