component: fix missed cleanup in case of devres failure

In try_to_bring_up_master(), we tear down the master's component list
for each error case, except for devres group failure.  Fix this
oversight by making the code less prone to such mistakes.
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

drivers/base/component.c

@@ -113,22 +113,22 @@ static void master_remove_components(struct master *master)
 static int try_to_bring_up_master(struct master *master,
 	struct component *component)
 {
-	int ret = 0;
+	int ret;
+
+	if (master->bound)
+		return 0;
 
-	if (!master->bound) {
 	/*
 	 * Search the list of components, looking for components that
 	 * belong to this master, and attach them to the master.
 	 */
 	if (master->ops->add_components(master->dev, master)) {
 		/* Failed to find all components */
-			master_remove_components(master);
 		ret = 0;
 		goto out;
 	}
 
 	if (component && component->master != master) {
-			master_remove_components(master);
 		ret = 0;
 		goto out;
 	}
@@ -143,14 +143,14 @@ static int try_to_bring_up_master(struct master *master,
 	if (ret < 0) {
 		devres_release_group(master->dev, NULL);
 		dev_info(master->dev, "master bind failed: %d\n", ret);
-			master_remove_components(master);
 		goto out;
 	}
 
 	master->bound = true;
-		ret = 1;
-	}
+	return 1;
+
 out:
+	master_remove_components(master);
 
 	return ret;
 }