diff options
Diffstat (limited to 'drivers/scsi/aic7xxx/aic79xx_osm.c')
-rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index 7fc6c76e519b..31db0edc7cf9 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c | |||
@@ -1511,17 +1511,17 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd) | |||
1511 | ahd_name(ahd), cmd->device->channel, cmd->device->id, | 1511 | ahd_name(ahd), cmd->device->channel, cmd->device->id, |
1512 | cmd->device->lun, cmd); | 1512 | cmd->device->lun, cmd); |
1513 | #endif | 1513 | #endif |
1514 | ahd_midlayer_entrypoint_lock(ahd, &s); | 1514 | ahd_lock(ahd, &s); |
1515 | 1515 | ||
1516 | dev = ahd_linux_get_device(ahd, cmd->device->channel, cmd->device->id, | 1516 | dev = ahd_linux_get_device(ahd, cmd->device->channel, cmd->device->id, |
1517 | cmd->device->lun, /*alloc*/FALSE); | 1517 | cmd->device->lun, /*alloc*/FALSE); |
1518 | if (dev == NULL) { | 1518 | if (dev == NULL) { |
1519 | ahd_midlayer_entrypoint_unlock(ahd, &s); | 1519 | ahd_unlock(ahd, &s); |
1520 | kfree(recovery_cmd); | 1520 | kfree(recovery_cmd); |
1521 | return (FAILED); | 1521 | return (FAILED); |
1522 | } | 1522 | } |
1523 | if ((scb = ahd_get_scb(ahd, AHD_NEVER_COL_IDX)) == NULL) { | 1523 | if ((scb = ahd_get_scb(ahd, AHD_NEVER_COL_IDX)) == NULL) { |
1524 | ahd_midlayer_entrypoint_unlock(ahd, &s); | 1524 | ahd_unlock(ahd, &s); |
1525 | kfree(recovery_cmd); | 1525 | kfree(recovery_cmd); |
1526 | return (FAILED); | 1526 | return (FAILED); |
1527 | } | 1527 | } |
@@ -1570,7 +1570,7 @@ ahd_linux_dev_reset(Scsi_Cmnd *cmd) | |||
1570 | spin_lock_irq(&ahd->platform_data->spin_lock); | 1570 | spin_lock_irq(&ahd->platform_data->spin_lock); |
1571 | ahd_schedule_runq(ahd); | 1571 | ahd_schedule_runq(ahd); |
1572 | ahd_linux_run_complete_queue(ahd); | 1572 | ahd_linux_run_complete_queue(ahd); |
1573 | ahd_midlayer_entrypoint_unlock(ahd, &s); | 1573 | ahd_unlock(ahd, &s); |
1574 | printf("%s: Device reset returning 0x%x\n", ahd_name(ahd), retval); | 1574 | printf("%s: Device reset returning 0x%x\n", ahd_name(ahd), retval); |
1575 | return (retval); | 1575 | return (retval); |
1576 | } | 1576 | } |