diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-05-28 07:55:48 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-17 13:05:03 -0400 |
commit | 94d0e7b805961c44e4dc486ffc21075084bb7175 (patch) | |
tree | 1609752ea7a9adb28583147f0bea33a9f10877d7 /drivers/scsi/megaraid.c | |
parent | 8fa728a26886f56a9ee10a44fea0ddda301d21c3 (diff) |
[SCSI] allow sleeping in ->eh_device_reset_handler()
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/megaraid.c')
-rw-r--r-- | drivers/scsi/megaraid.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 8d707b29027d..80b0c40c522b 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c | |||
@@ -1938,7 +1938,7 @@ megaraid_abort(Scsi_Cmnd *cmd) | |||
1938 | 1938 | ||
1939 | 1939 | ||
1940 | static int | 1940 | static int |
1941 | megaraid_reset(Scsi_Cmnd *cmd) | 1941 | __megaraid_reset(Scsi_Cmnd *cmd) |
1942 | { | 1942 | { |
1943 | adapter_t *adapter; | 1943 | adapter_t *adapter; |
1944 | megacmd_t mc; | 1944 | megacmd_t mc; |
@@ -1972,6 +1972,18 @@ megaraid_reset(Scsi_Cmnd *cmd) | |||
1972 | return rval; | 1972 | return rval; |
1973 | } | 1973 | } |
1974 | 1974 | ||
1975 | static int | ||
1976 | megaraid_reset(Scsi_Cmnd *cmd) | ||
1977 | { | ||
1978 | adapter = (adapter_t *)cmd->device->host->hostdata; | ||
1979 | int rc; | ||
1980 | |||
1981 | spin_lock_irq(&adapter->lock); | ||
1982 | rc = __megaraid_reset(cmd); | ||
1983 | spin_unlock_irq(&adapter->lock); | ||
1984 | |||
1985 | return rc; | ||
1986 | } | ||
1975 | 1987 | ||
1976 | 1988 | ||
1977 | /** | 1989 | /** |