diff mbox

[linux,dev-4.7,v2] drivers/fsi: Change hub sysfs name

Message ID 20170302214625.69263-1-cbostic@linux.vnet.ibm.com
State Accepted, archived
Headers show

Commit Message

Christopher Bostic March 2, 2017, 9:46 p.m. UTC
Fix duplicate "hub@00" naming bug when two or more hubs are
detected during scan. Each hub was assigned id '00'. Duplicate
hub device names were causing kernel warnings to console on
every scan.  Create a unique name by using the upstream master's
idx field. i.e. hub@00, hub@01, ...

Signed-off-by: Christopher Bostic <cbostic@linux.vnet.ibm.com>
---
v2:
    Add more description for the change.
---
 drivers/fsi/fsi-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Joel Stanley March 3, 2017, 7:51 a.m. UTC | #1
On Fri, Mar 3, 2017 at 8:16 AM, Christopher Bostic
<cbostic@linux.vnet.ibm.com> wrote:
> Fix duplicate "hub@00" naming bug when two or more hubs are
> detected during scan. Each hub was assigned id '00'. Duplicate
> hub device names were causing kernel warnings to console on
> every scan.  Create a unique name by using the upstream master's
> idx field. i.e. hub@00, hub@01, ...
>
> Signed-off-by: Christopher Bostic <cbostic@linux.vnet.ibm.com>
> ---
> v2:
>     Add more description for the change.

Much better commit message. Thanks for the explanation.

Applied to dev-4.7.

Cheers,

Joel

> ---
>  drivers/fsi/fsi-core.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
> index 542544e..b9573c5 100644
> --- a/drivers/fsi/fsi-core.c
> +++ b/drivers/fsi/fsi-core.c
> @@ -437,7 +437,7 @@ static int fsi_slave_scan(struct fsi_slave *slave)
>                                 return -ENOMEM;
>
>                         device_initialize(&hub->dev);
> -                       dev_set_name(&hub->dev, "hub@%02x", hub->master.idx);
> +                       dev_set_name(&hub->dev, "hub@%02x", slave->master->idx);
>                         hub->dev.release = hub_master_release;
>                         rc = device_add(&hub->dev);
>                         if (rc)
> --
> 1.8.2.2
>
diff mbox

Patch

diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c
index 542544e..b9573c5 100644
--- a/drivers/fsi/fsi-core.c
+++ b/drivers/fsi/fsi-core.c
@@ -437,7 +437,7 @@  static int fsi_slave_scan(struct fsi_slave *slave)
 				return -ENOMEM;
 
 			device_initialize(&hub->dev);
-			dev_set_name(&hub->dev, "hub@%02x", hub->master.idx);
+			dev_set_name(&hub->dev, "hub@%02x", slave->master->idx);
 			hub->dev.release = hub_master_release;
 			rc = device_add(&hub->dev);
 			if (rc)