[SCSI] ses: code_set == 1 is tested twice
authorRoel Kluin <roel.kluin@gmail.com>
Tue, 17 Feb 2009 15:59:24 +0000 (16:59 +0100)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Thu, 12 Mar 2009 17:58:14 +0000 (12:58 -0500)
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/scsi/ses.c

index f2cf95235543c3cce8c9ad56f9f98a5894ce4e94..c9146d751cbf17af70d8f509d6a29ba13b476052 100644 (file)
@@ -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 |