aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Hughes <john@Calva.COM>2009-11-04 19:01:22 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-14 16:52:48 -0700
commit53bbce2b6e5f66b006e3931c40fd85483f4beb8b (patch)
treef88921fab23f29c31e9f5b1a90a4a89ee1759ea9
parent4d5ad63856508c834ef6cf86b53539fbba4de73c (diff)
ses: show devices for enclosures with no page 7
commit 877a55979c189c590e819a61cbbe2b7947875f17 upstream. 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. Signed-off-by: James Bottomley <James.Bottomley@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/scsi/ses.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index 3c8a0248ea45..3b082ddccd21 100644
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -389,9 +389,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;
}
+ 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) {