| From 877a55979c189c590e819a61cbbe2b7947875f17 Mon Sep 17 00:00:00 2001 |
| From: John Hughes <john@Calva.COM> |
| Date: Wed, 4 Nov 2009 19:01:22 +0100 |
| Subject: [SCSI] ses: show devices for enclosures with no page 7 |
| |
| From: John Hughes <john@Calva.COM> |
| |
| 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> |
| |
| --- |
| drivers/scsi/ses.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/scsi/ses.c |
| +++ b/drivers/scsi/ses.c |
| @@ -389,9 +389,9 @@ static void ses_enclosure_data_process(s |
| 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) { |
