aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Vasquez <andrew.vasquez@qlogic.com>2005-08-26 22:09:00 -0400
committerJames Bottomley <jejb@mulgrave.(none)>2005-09-04 20:53:12 -0400
commit06c22bd13f4eb55e291d5a31280b2ae5a70ad00d (patch)
treed86cf7ccf317a5280f0685e74129eed324cdb317
parentc00c72ae01c03d3d172150392419040f8d55ab04 (diff)
[SCSI] qla2xxx: Correct LED scheme definition.
Original implementation used an overloaded bit in the EFI parameters. The correct bit is BIT_4 of the special_options section of NVRAM. Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/qla2xxx/qla_def.h4
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index cdef86e49c60..b7f82b757cbc 100644
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -914,7 +914,7 @@ typedef struct {
914 * MSB BIT 1 = 914 * MSB BIT 1 =
915 * MSB BIT 2 = 915 * MSB BIT 2 =
916 * MSB BIT 3 = 916 * MSB BIT 3 =
917 * MSB BIT 4 = 917 * MSB BIT 4 = LED mode
918 * MSB BIT 5 = enable 50 ohm termination 918 * MSB BIT 5 = enable 50 ohm termination
919 * MSB BIT 6 = Data Rate (2300 only) 919 * MSB BIT 6 = Data Rate (2300 only)
920 * MSB BIT 7 = Data Rate (2300 only) 920 * MSB BIT 7 = Data Rate (2300 only)
@@ -1036,7 +1036,7 @@ typedef struct {
1036 * MSB BIT 1 = 1036 * MSB BIT 1 =
1037 * MSB BIT 2 = 1037 * MSB BIT 2 =
1038 * MSB BIT 3 = 1038 * MSB BIT 3 =
1039 * MSB BIT 4 = 1039 * MSB BIT 4 = LED mode
1040 * MSB BIT 5 = enable 50 ohm termination 1040 * MSB BIT 5 = enable 50 ohm termination
1041 * MSB BIT 6 = Data Rate (2300 only) 1041 * MSB BIT 6 = Data Rate (2300 only)
1042 * MSB BIT 7 = Data Rate (2300 only) 1042 * MSB BIT 7 = Data Rate (2300 only)
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index d12255fb9383..c619583e646b 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1564,7 +1564,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
1564 ha->flags.enable_lip_reset = ((nv->host_p[1] & BIT_1) ? 1 : 0); 1564 ha->flags.enable_lip_reset = ((nv->host_p[1] & BIT_1) ? 1 : 0);
1565 ha->flags.enable_lip_full_login = ((nv->host_p[1] & BIT_2) ? 1 : 0); 1565 ha->flags.enable_lip_full_login = ((nv->host_p[1] & BIT_2) ? 1 : 0);
1566 ha->flags.enable_target_reset = ((nv->host_p[1] & BIT_3) ? 1 : 0); 1566 ha->flags.enable_target_reset = ((nv->host_p[1] & BIT_3) ? 1 : 0);
1567 ha->flags.enable_led_scheme = ((nv->efi_parameters & BIT_3) ? 1 : 0); 1567 ha->flags.enable_led_scheme = (nv->special_options[1] & BIT_4) ? 1 : 0;
1568 1568
1569 ha->operating_mode = 1569 ha->operating_mode =
1570 (icb->add_firmware_options[0] & (BIT_6 | BIT_5 | BIT_4)) >> 4; 1570 (icb->add_firmware_options[0] & (BIT_6 | BIT_5 | BIT_4)) >> 4;