[SCSI] libsas: fix sas port naming
authorDan Williams <dan.j.williams@intel.com>
Mon, 16 Jan 2012 21:54:28 +0000 (13:54 -0800)
committerJames Bottomley <JBottomley@Parallels.com>
Wed, 29 Feb 2012 21:29:06 +0000 (15:29 -0600)
Make sas-port naming consistent with the expander-attached case whereby
the phy-id is the last digit in the port name.  Otherwise we get the
random behavior of the allocation order.

Reported-by: Patrick Thomson <patrick.s.thomson@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/libsas/sas_port.c

index 59ee8a0a6ea958aaf0026336fdcb717d285aafee..29f8fd3355236e1b0c086763e7e18382874a5e59 100644 (file)
@@ -122,7 +122,7 @@ static void sas_form_port(struct asd_sas_phy *phy)
        spin_unlock_irqrestore(&sas_ha->phy_port_lock, flags);
 
        if (!port->port) {
-               port->port = sas_port_alloc(phy->phy->dev.parent, port->id);
+               port->port = sas_port_alloc(phy->phy->dev.parent, phy->id);
                BUG_ON(!port->port);
                sas_port_add(port->port);
        }