[SCSI] qla2xxx: Correctly set mailboxes for extended init control block.
authorJoe Carnuccio <joe.carnuccio@qlogic.com>
Wed, 30 Oct 2013 07:38:11 +0000 (03:38 -0400)
committerJames Bottomley <JBottomley@Parallels.com>
Thu, 19 Dec 2013 15:38:57 +0000 (07:38 -0800)
Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/qla2xxx/qla_mbx.c

index a9aae50..ccc30d4 100644 (file)
@@ -1214,7 +1214,7 @@ qla2x00_init_firmware(scsi_qla_host_t *vha, uint16_t size)
        mcp->mb[6] = MSW(MSD(ha->init_cb_dma));
        mcp->mb[7] = LSW(MSD(ha->init_cb_dma));
        mcp->out_mb = MBX_7|MBX_6|MBX_3|MBX_2|MBX_1|MBX_0;
-       if ((IS_QLA81XX(ha) || IS_QLA83XX(ha)) && ha->ex_init_cb->ex_version) {
+       if (ha->ex_init_cb && ha->ex_init_cb->ex_version) {
                mcp->mb[1] = BIT_0;
                mcp->mb[10] = MSW(ha->ex_init_cb_dma);
                mcp->mb[11] = LSW(ha->ex_init_cb_dma);