diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-05-28 07:57:14 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-17 13:05:18 -0400 |
commit | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (patch) | |
tree | 552e02a44a21bd38db91729c85219542c2930ae2 /drivers/message/fusion/mptscsih.c | |
parent | 68b3aa7c9805aee9005a8ca53c5e99177961fbb9 (diff) |
[SCSI] allow sleeping in ->eh_host_reset_handler()
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/message/fusion/mptscsih.c')
-rw-r--r-- | drivers/message/fusion/mptscsih.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index efae9be45370..48ff314cdfbf 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
@@ -1899,7 +1899,6 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt) | |||
1899 | { | 1899 | { |
1900 | MPT_SCSI_HOST * hd; | 1900 | MPT_SCSI_HOST * hd; |
1901 | int status = SUCCESS; | 1901 | int status = SUCCESS; |
1902 | spinlock_t *host_lock = SCpnt->device->host->host_lock; | ||
1903 | 1902 | ||
1904 | /* If we can't locate the host to reset, then we failed. */ | 1903 | /* If we can't locate the host to reset, then we failed. */ |
1905 | if ((hd = (MPT_SCSI_HOST *) SCpnt->device->host->hostdata) == NULL){ | 1904 | if ((hd = (MPT_SCSI_HOST *) SCpnt->device->host->hostdata) == NULL){ |
@@ -1915,7 +1914,6 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt) | |||
1915 | /* If our attempts to reset the host failed, then return a failed | 1914 | /* If our attempts to reset the host failed, then return a failed |
1916 | * status. The host will be taken off line by the SCSI mid-layer. | 1915 | * status. The host will be taken off line by the SCSI mid-layer. |
1917 | */ | 1916 | */ |
1918 | spin_unlock_irq(host_lock); | ||
1919 | if (mpt_HardResetHandler(hd->ioc, CAN_SLEEP) < 0){ | 1917 | if (mpt_HardResetHandler(hd->ioc, CAN_SLEEP) < 0){ |
1920 | status = FAILED; | 1918 | status = FAILED; |
1921 | } else { | 1919 | } else { |
@@ -1925,8 +1923,6 @@ mptscsih_host_reset(struct scsi_cmnd *SCpnt) | |||
1925 | hd->tmPending = 0; | 1923 | hd->tmPending = 0; |
1926 | hd->tmState = TM_STATE_NONE; | 1924 | hd->tmState = TM_STATE_NONE; |
1927 | } | 1925 | } |
1928 | spin_lock_irq(host_lock); | ||
1929 | |||
1930 | 1926 | ||
1931 | dtmprintk( ( KERN_WARNING MYNAM ": mptscsih_host_reset: " | 1927 | dtmprintk( ( KERN_WARNING MYNAM ": mptscsih_host_reset: " |
1932 | "Status = %s\n", | 1928 | "Status = %s\n", |