rapidio: fix possible name leaks when rio_add_device() fails

[platform/kernel/linux-rpi.git] / drivers / rapidio / rio-scan.c

diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index 19b0c33..fdcf742 100644 (file)
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -454,8 +454,12 @@ static struct rio_dev *rio_setup_device(struct rio_net *net,
                                   0, 0xffff);
 
        ret = rio_add_device(rdev);
-       if (ret)
-               goto cleanup;
+       if (ret) {
+               if (rswitch)
+                       kfree(rswitch->route_table);
+               put_device(&rdev->dev);
+               return NULL;
+       }
 
        rio_dev_get(rdev);