Commit 877a5597 authored by John Hughes's avatar John Hughes Committed by James Bottomley

[SCSI] ses: show devices for enclosures with no page 7

enclosure page 7 gives us the "pretty" names of the enclosure slots.
Without a page 7, we can still use the enclosure code as long as we
make up numeric names for the slots. Unfortunately, the current code
fails to add any devices because the check for page 10 is in the wrong
place if we have no page 7.  Fix it so that devices show up even if
the enclosure has no page 7.

Cc: stable@kernel.org
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 4bbba111
...@@ -390,9 +390,9 @@ static void ses_enclosure_data_process(struct enclosure_device *edev, ...@@ -390,9 +390,9 @@ static void ses_enclosure_data_process(struct enclosure_device *edev,
len = (desc_ptr[2] << 8) + desc_ptr[3]; len = (desc_ptr[2] << 8) + desc_ptr[3];
/* skip past overall descriptor */ /* skip past overall descriptor */
desc_ptr += len + 4; desc_ptr += len + 4;
if (ses_dev->page10)
addl_desc_ptr = ses_dev->page10 + 8;
} }
if (ses_dev->page10)
addl_desc_ptr = ses_dev->page10 + 8;
type_ptr = ses_dev->page1 + 12 + ses_dev->page1[11]; type_ptr = ses_dev->page1 + 12 + ses_dev->page1[11];
components = 0; components = 0;
for (i = 0; i < types; i++, type_ptr += 4) { for (i = 0; i < types; i++, type_ptr += 4) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment