[PATCH] for 2.6.32-rc6 make ses enclosure links even if diagnostic page7 is absent

John Hughes <[email protected]> Thu, 05 Nov 2009 16:47:01 +0100
Newsgroups gmane.linux.cluster.ssic.devel
Message-ID <[email protected]>
Use the diagnostic page 10 information from SES enclosure devices even 
if page 7 (slot names) is missing.  This allows creation of the 
enclosure/slot/device and device/enclosure links even if the enclosure 
doesn't name its slots.

Signed-off-by: John Hughes <[email protected]>

diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index 55b034b..725a095 100644
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -389,9 +389,9 @@ static void ses_enclosure_data_process(struct enclosure_devi
                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) {



------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with
Crystal Reports now.  http://p.sf.net/sfu/bobj-july