Commit 877a5597 authored Nov 04, 2009 by John Hughes Committed by James Bottomley Mar 23, 2011

[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>

parent 4bbba111

drivers/scsi/ses.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -390,9 +390,9 @@ static void ses_enclosure_data_process(struct enclosure_device *edev,
		len = (desc_ptr[2] << 8) + desc_ptr[3];
		/* skip past overall descriptor */
		desc_ptr += len + 4;
		}
		if (ses_dev->page10)
		addl_desc_ptr = ses_dev->page10 + 8;
		}
		type_ptr = ses_dev->page1 + 12 + ses_dev->page1[11];
		components = 0;
		for (i = 0; i < types; i++, type_ptr += 4) {

Admin message