summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJoe Carnuccio2015-08-04 19:37:53 +0200
committerJames Bottomley2015-08-27 02:40:44 +0200
commitcc790764391a68511cf6a7e4dd18eeb6e7640233 (patch)
tree5bc42e4ec3dc3c73399bc4b007d417c181911a31 /drivers/scsi
parentqla2xxx: Handle AEN8014 incoming port logout. (diff)
downloadkernel-qcow2-linux-cc790764391a68511cf6a7e4dd18eeb6e7640233.tar.gz
kernel-qcow2-linux-cc790764391a68511cf6a7e4dd18eeb6e7640233.tar.xz
kernel-qcow2-linux-cc790764391a68511cf6a7e4dd18eeb6e7640233.zip
qla2xxx: Use ssdid to gate semaphore manipulation.
Execute qla25xx_manipulate_risc_semaphore() only for ssdid 0x0175 and 0x0240. Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com> Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com> Signed-off-by: James Bottomley <JBottomley@Odin.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/qla2xxx/qla_init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 5a5ca43e5e90..f64bb6b7a08f 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1272,14 +1272,14 @@ qla25xx_write_risc_sema_reg(scsi_qla_host_t *vha, uint32_t data)
static void
qla25xx_manipulate_risc_semaphore(scsi_qla_host_t *vha)
{
- struct qla_hw_data *ha = vha->hw;
uint32_t wd32 = 0;
uint delta_msec = 100;
uint elapsed_msec = 0;
uint timeout_msec;
ulong n;
- if (!IS_QLA25XX(ha) && !IS_QLA2031(ha))
+ if (vha->hw->pdev->subsystem_device != 0x0175 &&
+ vha->hw->pdev->subsystem_device != 0x0240)
return;
attempt: