Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / drivers / scsi / qla2xxx / qla_init.c

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index eb59c796a795de06af7d2fa19a64a30e022a3b87..364bb52ed2a66ed4f65dc32422cdec2801a25094 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -237,15 +237,13 @@ qla2x00_async_login(struct scsi_qla_host *vha, fc_port_t *fcport,
        qla2x00_init_timer(sp, qla2x00_get_async_timeout(vha) + 2);
 
        sp->done = qla2x00_async_login_sp_done;
-       if (N2N_TOPO(fcport->vha->hw) && fcport_is_bigger(fcport)) {
+       if (N2N_TOPO(fcport->vha->hw) && fcport_is_bigger(fcport))
                lio->u.logio.flags |= SRB_LOGIN_PRLI_ONLY;
-       } else {
+       else
                lio->u.logio.flags |= SRB_LOGIN_COND_PLOGI;
 
-               if (fcport->fc4f_nvme)
-                       lio->u.logio.flags |= SRB_LOGIN_SKIP_PRLI;
-
-       }
+       if (fcport->fc4f_nvme)
+               lio->u.logio.flags |= SRB_LOGIN_SKIP_PRLI;
 
        ql_dbg(ql_dbg_disc, vha, 0x2072,
            "Async-login - %8phC hdl=%x, loopid=%x portid=%02x%02x%02x "