aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ibmmca.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-05-28 07:57:14 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-17 13:05:18 -0400
commitdf0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (patch)
tree552e02a44a21bd38db91729c85219542c2930ae2 /drivers/scsi/ibmmca.c
parent68b3aa7c9805aee9005a8ca53c5e99177961fbb9 (diff)
[SCSI] allow sleeping in ->eh_host_reset_handler()
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/ibmmca.c')
-rw-r--r--drivers/scsi/ibmmca.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c
index 0018fb5c09a9..b5dc35355570 100644
--- a/drivers/scsi/ibmmca.c
+++ b/drivers/scsi/ibmmca.c
@@ -2237,7 +2237,7 @@ static int ibmmca_abort(Scsi_Cmnd * cmd)
2237 return rc; 2237 return rc;
2238} 2238}
2239 2239
2240static int ibmmca_host_reset(Scsi_Cmnd * cmd) 2240static int __ibmmca_host_reset(Scsi_Cmnd * cmd)
2241{ 2241{
2242 struct Scsi_Host *shpnt; 2242 struct Scsi_Host *shpnt;
2243 Scsi_Cmnd *cmd_aid; 2243 Scsi_Cmnd *cmd_aid;
@@ -2324,6 +2324,18 @@ static int ibmmca_host_reset(Scsi_Cmnd * cmd)
2324 return SUCCESS; 2324 return SUCCESS;
2325} 2325}
2326 2326
2327static int ibmmca_host_reset(Scsi_Cmnd * cmd)
2328{
2329 struct Scsi_Host *shpnt = cmd->device->host;
2330 int rc;
2331
2332 spin_lock_irq(shpnt->host_lock);
2333 rc = __ibmmca_host_reset(cmd);
2334 spin_unlock_irq(shpnt->host_lock);
2335
2336 return rc;
2337}
2338
2327static int ibmmca_biosparam(struct scsi_device *sdev, struct block_device *bdev, sector_t capacity, int *info) 2339static int ibmmca_biosparam(struct scsi_device *sdev, struct block_device *bdev, sector_t capacity, int *info)
2328{ 2340{
2329 int size = capacity; 2341 int size = capacity;