Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 877a55979c189c590e819a61cbbe2b7947875f17

Authored by John Hughes
Committed by James Bottomley
1 parent 4bbba111d9
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[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: James Bottomley <James.Bottomley@suse.de>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

... ... @@ -390,9 +390,9 @@
390 390 len = (desc_ptr[2] << 8) + desc_ptr[3];
391 391 /* skip past overall descriptor */
392 392 desc_ptr += len + 4;
393   - if (ses_dev->page10)
394   - addl_desc_ptr = ses_dev->page10 + 8;
395 393 }
  394 + if (ses_dev->page10)
  395 + addl_desc_ptr = ses_dev->page10 + 8;
396 396 type_ptr = ses_dev->page1 + 12 + ses_dev->page1[11];
397 397 components = 0;
398 398 for (i = 0; i < types; i++, type_ptr += 4) {