diff options
| author | John Hughes <john@Calva.COM> | 2009-11-04 19:01:22 +0100 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2011-04-30 16:53:25 +0200 |
| commit | 9a293950f9eb64c0f230a8508584ad8a04abd278 (patch) | |
| tree | 79757f086ad85c8756399a28e28a23b269e3e87a /drivers | |
| parent | 6daf19a87eaeaa9f02942064f0299cd649539a44 (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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/ses.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c index 1bcf3c33d7ff..86ee979d40d8 100644 --- a/drivers/scsi/ses.c +++ b/drivers/scsi/ses.c @@ -558,9 +558,9 @@ static int ses_intf_add(struct device *cdev, 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) { |