From b3f1f9aa082b2ab86dec4db3d8b1566af345387e Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Tue, 17 Feb 2009 16:59:24 +0100 Subject: [SCSI] ses: code_set == 1 is tested twice Signed-off-by: Roel Kluin Signed-off-by: James Bottomley --- drivers/scsi/ses.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c index f2cf95235543..c9146d751cbf 100644 --- a/drivers/scsi/ses.c +++ b/drivers/scsi/ses.c @@ -370,7 +370,7 @@ static void ses_match_to_enclosure(struct enclosure_device *edev, u8 type = desc[1] & 0x0f; u8 len = desc[3]; - if (piv && code_set == 1 && assoc == 1 && code_set == 1 + if (piv && code_set == 1 && assoc == 1 && proto == SCSI_PROTOCOL_SAS && type == 3 && len == 8) efd.addr = (u64)desc[4] << 56 | (u64)desc[5] << 48 | -- cgit v1.2.2