Skip to content

Commit

Permalink
NTB: Multiple NTB client fix
Browse files Browse the repository at this point in the history
Fix issue with adding multiple ntb client devices to the ntb virtual
bus.  Previously, multiple devices would be added with the same name,
resulting in crashes.  To get around this issue, add a unique number to
the device when it is added.

Signed-off-by: Jon Mason <jon.mason@intel.com>
  • Loading branch information
Jon Mason committed May 15, 2013
1 parent 904435c commit 8b19d45
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/ntb/ntb_transport.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ int ntb_register_client_dev(char *device_name)
{
struct ntb_transport_client_dev *client_dev;
struct ntb_transport *nt;
int rc;
int rc, i = 0;

if (list_empty(&ntb_transport_list))
return -ENODEV;
Expand All @@ -318,7 +318,7 @@ int ntb_register_client_dev(char *device_name)
dev = &client_dev->dev;

/* setup and register client devices */
dev_set_name(dev, "%s", device_name);
dev_set_name(dev, "%s%d", device_name, i);
dev->bus = &ntb_bus_type;
dev->release = ntb_client_release;
dev->parent = &ntb_query_pdev(nt->ndev)->dev;
Expand All @@ -330,6 +330,7 @@ int ntb_register_client_dev(char *device_name)
}

list_add_tail(&client_dev->entry, &nt->client_devs);
i++;
}

return 0;
Expand Down

0 comments on commit 8b19d45

Please sign in to comment.