From 771dc27756516d217a26d90005e442eb3412af84 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Thu, 4 Nov 2010 19:31:35 +0000 Subject: [PATCH] Merge of the trunk's r2581: Revert r2020 to replace it by a better fix git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/2.0.0.x@2598 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t/qla_os.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/qla2x00t/qla_os.c b/qla2x00t/qla_os.c index 135aab15e..a9efaa425 100644 --- a/qla2x00t/qla_os.c +++ b/qla2x00t/qla_os.c @@ -671,14 +671,8 @@ qla2x00_abort_fcport_cmds(fc_port_t *fcport) int cnt; unsigned long flags; srb_t *sp; - scsi_qla_host_t *ha; - scsi_qla_host_t *pha; - - if (fcport == NULL) - goto out; - - ha = fcport->ha; - pha = to_qla_parent(ha); + scsi_qla_host_t *ha = fcport->ha; + scsi_qla_host_t *pha = to_qla_parent(ha); spin_lock_irqsave(&pha->hardware_lock, flags); for (cnt = 1; cnt < MAX_OUTSTANDING_COMMANDS; cnt++) { @@ -703,9 +697,6 @@ qla2x00_abort_fcport_cmds(fc_port_t *fcport) spin_lock_irqsave(&pha->hardware_lock, flags); } spin_unlock_irqrestore(&pha->hardware_lock, flags); - -out: - return; } static void