From: Viresh Kumar <viresh.kumar@linaro.org>
Date: Thu, 19 May 2016 12:57:25 +0000 (+0530)
Subject: greybus: fw-core: destroy connections on error
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=825f79ae7620fa98586c4d2504030eca96d55c59;p=linux-beck.git

greybus: fw-core: destroy connections on error

In one of the error cases we aren't destroying the connections created
earlier. Fix it.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/drivers/staging/greybus/fw-core.c b/drivers/staging/greybus/fw-core.c
index 90d32227a490..33941efe13ea 100644
--- a/drivers/staging/greybus/fw-core.c
+++ b/drivers/staging/greybus/fw-core.c
@@ -139,7 +139,7 @@ static int gb_fw_core_probe(struct gb_bundle *bundle,
 			dev_err(&bundle->dev, "invalid protocol id (0x%02x)\n",
 				protocol_id);
 			ret = -EINVAL;
-			goto err_free_fw_core;
+			goto err_destroy_connections;
 		}
 	}
 
@@ -187,7 +187,6 @@ err_destroy_connections:
 	gb_connection_destroy(fw_core->mgmt_connection);
 	gb_connection_destroy(fw_core->spi_connection);
 	gb_connection_destroy(fw_core->download_connection);
-err_free_fw_core:
 	kfree(fw_core);
 
 	return ret;