ida_simple_get on failure can return an error. The patch ensures that
the dev_set_name is set on non failure cases.

Signed-off-by: Aditya Pakki <pakki...@umn.edu>
---
 drivers/thunderbolt/xdomain.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/thunderbolt/xdomain.c b/drivers/thunderbolt/xdomain.c
index e27dd8beb94b..b1768f595259 100644
--- a/drivers/thunderbolt/xdomain.c
+++ b/drivers/thunderbolt/xdomain.c
@@ -772,7 +772,9 @@ static void enumerate_services(struct tb_xdomain *xd)
                svc->dev.bus = &tb_bus_type;
                svc->dev.type = &tb_service_type;
                svc->dev.parent = &xd->dev;
-               dev_set_name(&svc->dev, "%s.%d", dev_name(&xd->dev), svc->id);
+               if (svc->id >= 0)
+                       dev_set_name(&svc->dev, "%s.%d", dev_name(&xd->dev),
+                                       svc->id);
 
                if (device_register(&svc->dev)) {
                        put_device(&svc->dev);
-- 
2.17.1

Reply via email to