aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 1289a18e7ad2..7a5d52f23f53 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -3371,7 +3371,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
3371 strcpy(ha->model_number, "QLA2462"); 3371 strcpy(ha->model_number, "QLA2462");
3372 3372
3373 /* Prepare nodename */ 3373 /* Prepare nodename */
3374 if ((icb->firmware_options_1 & BIT_14) == 0) { 3374 if ((icb->firmware_options_1 & __constant_cpu_to_le32(BIT_14)) == 0) {
3375 /* 3375 /*
3376 * Firmware will apply the following mask if the nodename was 3376 * Firmware will apply the following mask if the nodename was
3377 * not provided. 3377 * not provided.
@@ -3387,8 +3387,8 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
3387 ha->flags.enable_target_reset = 1; 3387 ha->flags.enable_target_reset = 1;
3388 ha->flags.enable_led_scheme = 0; 3388 ha->flags.enable_led_scheme = 0;
3389 3389
3390 ha->operating_mode = 3390 ha->operating_mode = (le32_to_cpu(icb->firmware_options_2) &
3391 (icb->firmware_options_2 & (BIT_6 | BIT_5 | BIT_4)) >> 4; 3391 (BIT_6 | BIT_5 | BIT_4)) >> 4;
3392 3392
3393 memcpy(ha->fw_seriallink_options24, nv->seriallink_options, 3393 memcpy(ha->fw_seriallink_options24, nv->seriallink_options,
3394 sizeof(ha->fw_seriallink_options24)); 3394 sizeof(ha->fw_seriallink_options24));