lkml.org 
[lkml]   [2011]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [250/275] ses: show devices for enclosures with no page 7
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    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>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>

    ---
    drivers/scsi/ses.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    Index: linux-2.6.35.y/drivers/scsi/ses.c
    ===================================================================
    --- linux-2.6.35.y.orig/drivers/scsi/ses.c 2011-03-29 22:50:11.521963601 -0700
    +++ linux-2.6.35.y/drivers/scsi/ses.c 2011-03-29 23:03:03.484211019 -0700
    @@ -390,9 +390,9 @@
    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) {

    \
     
     \ /
      Last update: 2011-03-30 23:15    [W:0.042 / U:60.656 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site