summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-20 10:11:25 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-20 10:11:25 -0400
commit323cb3ce6eea9d4e72a81a9ffaac4c4e5b800810 (patch)
tree01c9fc4f3d6757705d0c286da2aa153704c2a3bc /drivers/scsi
parent59a10b172fccaea793352c00fd9065f0a5b4ef70 (diff)
parent93918e9afc76717176e9e114e79cdbb602a45ae8 (diff)
Merge branch 'master'
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/scsi_error.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index ad534216507..52b348c36d5 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1645,6 +1645,8 @@ int scsi_error_handler(void *data)
set_current_state(TASK_INTERRUPTIBLE);
}
+ __set_current_state(TASK_RUNNING);
+
SCSI_LOG_ERROR_RECOVERY(1, printk("Error handler scsi_eh_%d"
" exiting\n",shost->host_no));