aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/fc4/fc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c
index fbd9ff79b7b8..e3c958823533 100644
--- a/drivers/fc4/fc.c
+++ b/drivers/fc4/fc.c
@@ -765,8 +765,6 @@ void fcp_release(fc_channel *fcchain, int count) /* count must > 0 */
765 765
766static void fcp_scsi_done (Scsi_Cmnd *SCpnt) 766static void fcp_scsi_done (Scsi_Cmnd *SCpnt)
767{ 767{
768 unsigned long flags;
769
770 if (FCP_CMND(SCpnt)->done) 768 if (FCP_CMND(SCpnt)->done)
771 FCP_CMND(SCpnt)->done(SCpnt); 769 FCP_CMND(SCpnt)->done(SCpnt);
772} 770}
@@ -907,8 +905,6 @@ int fcp_scsi_abort(Scsi_Cmnd *SCpnt)
907 */ 905 */
908 906
909 if (++fc->abort_count < (fc->can_queue >> 1)) { 907 if (++fc->abort_count < (fc->can_queue >> 1)) {
910 unsigned long flags;
911
912 SCpnt->result = DID_ABORT; 908 SCpnt->result = DID_ABORT;
913 fcmd->done(SCpnt); 909 fcmd->done(SCpnt);
914 printk("FC: soft abort\n"); 910 printk("FC: soft abort\n");
@@ -931,6 +927,7 @@ void fcp_scsi_reset_done(Scsi_Cmnd *SCpnt)
931 927
932int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt) 928int fcp_scsi_dev_reset(Scsi_Cmnd *SCpnt)
933{ 929{
930 unsigned long flags;
934 fcp_cmd *cmd; 931 fcp_cmd *cmd;
935 fcp_cmnd *fcmd; 932 fcp_cmnd *fcmd;
936 fc_channel *fc = FC_SCMND(SCpnt); 933 fc_channel *fc = FC_SCMND(SCpnt);
@@ -1028,6 +1025,7 @@ static int __fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)
1028 1025
1029int fcp_scsi_host_reset(Scsi_Cmnd *SCpnt) 1026int fcp_scsi_host_reset(Scsi_Cmnd *SCpnt)
1030{ 1027{
1028 unsigned long flags;
1031 int rc; 1029 int rc;
1032 1030
1033 spin_lock_irqsave(SCpnt->device->host->host_lock, flags); 1031 spin_lock_irqsave(SCpnt->device->host->host_lock, flags);