diff --git a/[refs] b/[refs]
index 7d527f40290d..c1bbc0edb008 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3442f802a8169a0c18d411d95f0e71b9205ed607
+refs/heads/master: b3f1f9aa082b2ab86dec4db3d8b1566af345387e
diff --git a/trunk/drivers/scsi/ses.c b/trunk/drivers/scsi/ses.c
index f2cf95235543..c9146d751cbf 100644
--- a/trunk/drivers/scsi/ses.c
+++ b/trunk/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 |