[SCSI] allow sleeping in ->eh_bus_reset_handler()

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

2 files changed, 6 insertions, 2 deletions

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c
index 31db0edc7cf9..53b7b2c15f86 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -1591,11 +1591,11 @@ ahd_linux_bus_reset(Scsi_Cmnd *cmd)
                 printf("%s: Bus reset called for cmd %p\n",
                        ahd_name(ahd), cmd);
 #endif
-        ahd_midlayer_entrypoint_lock(ahd, &s);
+        ahd_lock(ahd, &s);
         found = ahd_reset_channel(ahd, cmd->device->channel + 'A',
                                   /*initiate reset*/TRUE);
         ahd_linux_run_complete_queue(ahd);
-        ahd_midlayer_entrypoint_unlock(ahd, &s);
+        ahd_unlock(ahd, &s);
 
         if (bootverbose)
                 printf("%s: SCSI bus reset delivered. "
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c
index 89f073a3b766..b89094db14c1 100644
--- a/drivers/scsi/aic7xxx/aic7xxx_osm.c
+++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c
@@ -829,10 +829,14 @@ ahc_linux_bus_reset(struct scsi_cmnd *cmd)
 {
         struct ahc_softc *ahc;
         int    found;
+        unsigned long flags;
 
         ahc = *(struct ahc_softc **)cmd->device->host->hostdata;
+
+        ahc_lock(ahc, &flags);
         found = ahc_reset_channel(ahc, cmd->device->channel + 'A',
                                   /*initiate reset*/TRUE);
+        ahc_unlock(ahc, &flags);
 
         if (bootverbose)
                 printf("%s: SCSI bus reset delivered. "