From dbb58864571af4d8c08f1324eb2895f85e5addaa Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 16 Jan 2012 13:54:28 -0800 Subject: [PATCH] --- yaml --- r: 293023 b: refs/heads/master c: a692b0eec5efae382dfa800e8b4b083f172921a7 h: refs/heads/master i: 293021: 23dc8457016bf3f2ff2098a4a3e866afe8b7bf2f 293019: 0e0e30e08c5f53cc45e205ada6095b5a0d7e7c93 293015: fd5c2c7b268b3ea4a7865cf5089792c43baabedc 293007: 6de19a4161486bc2f9ef5c727050906383e176c8 292991: 916ef954cfedc5b7acf4286d9747ef8c6158ee6a v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libsas/sas_port.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6111783cd7fa..662f36dfe0f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d214d81e883b6fc6f11cc772ff88585565d45cce +refs/heads/master: a692b0eec5efae382dfa800e8b4b083f172921a7 diff --git a/trunk/drivers/scsi/libsas/sas_port.c b/trunk/drivers/scsi/libsas/sas_port.c index 59ee8a0a6ea9..29f8fd335523 100644 --- a/trunk/drivers/scsi/libsas/sas_port.c +++ b/trunk/drivers/scsi/libsas/sas_port.c @@ -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); }