2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 6f7cf3970383..e9b800e72559 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -3888,7 +3888,7 @@ qla2x00_update_fcports(scsi_qla_host_t *base_vha)
         list_for_each_entry(vha, &base_vha->hw->vp_list, list) {
                 atomic_inc(&vha->vref_count);
                 list_for_each_entry(fcport, &vha->vp_fcports, list) {
-                        if (fcport && fcport->drport &&
+                        if (fcport->drport &&
                             atomic_read(&fcport->state) != FCS_UNCONFIGURED) {
                                 spin_unlock_irqrestore(&ha->vport_slock, flags);
 
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index df2c1e7ab652..1814df868526 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -2371,7 +2371,7 @@ qla2x00_remove_one(struct pci_dev *pdev)
         list_for_each_entry(vha, &ha->vp_list, list) {
                 atomic_inc(&vha->vref_count);
 
-                if (vha && vha->fc_vport) {
+                if (vha->fc_vport) {
                         spin_unlock_irqrestore(&ha->vport_slock, flags);
 
                         fc_vport_terminate(vha->fc_vport);