diff options
author | Roel Kluin <roel.kluin@gmail.com> | 2009-02-17 16:59:24 +0100 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-03-12 12:58:14 -0500 |
commit | b3f1f9aa082b2ab86dec4db3d8b1566af345387e (patch) | |
tree | 9b02c81b2633002cb0503fc31c66e47c6345648a /drivers/scsi | |
parent | 3442f802a8169a0c18d411d95f0e71b9205ed607 (diff) | |
download | kernel_samsung_smdk4412-b3f1f9aa082b2ab86dec4db3d8b1566af345387e.zip kernel_samsung_smdk4412-b3f1f9aa082b2ab86dec4db3d8b1566af345387e.tar.gz kernel_samsung_smdk4412-b3f1f9aa082b2ab86dec4db3d8b1566af345387e.tar.bz2 |
[SCSI] ses: code_set == 1 is tested twice
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/ses.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c index f2cf952..c9146d7 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 | |