From: Johan Hovold <johan@hovoldconsulting.com>
Date: Wed, 13 Apr 2016 17:19:05 +0000 (+0200)
Subject: greybus: control: return error pointer when failing to create control device
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b6147e4fb13e926878dbef9adae429faf8d8c2dd;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

greybus: control: return error pointer when failing to create control device

Return an error pointer when failing to create a control device.

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

diff --git a/drivers/staging/greybus/control.c b/drivers/staging/greybus/control.c
index 58a3d6089701..20aa366c3883 100644
--- a/drivers/staging/greybus/control.c
+++ b/drivers/staging/greybus/control.c
@@ -257,23 +257,26 @@ struct device_type greybus_control_type = {
 
 struct gb_control *gb_control_create(struct gb_interface *intf)
 {
+	struct gb_connection *connection;
 	struct gb_control *control;
 
 	control = kzalloc(sizeof(*control), GFP_KERNEL);
 	if (!control)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	control->intf = intf;
 
-	control->connection = gb_connection_create_control(intf);
-	if (IS_ERR(control->connection)) {
+	connection = gb_connection_create_control(intf);
+	if (IS_ERR(connection)) {
 		dev_err(&intf->dev,
 				"failed to create control connection: %ld\n",
-				PTR_ERR(control->connection));
+				PTR_ERR(connection));
 		kfree(control);
-		return NULL;
+		return ERR_CAST(connection);
 	}
 
+	control->connection = connection;
+
 	control->dev.parent = &intf->dev;
 	control->dev.bus = &greybus_bus_type;
 	control->dev.type = &greybus_control_type;
diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c
index ed56f2de7dbd..f6271127ffaa 100644
--- a/drivers/staging/greybus/interface.c
+++ b/drivers/staging/greybus/interface.c
@@ -381,6 +381,7 @@ struct device_type greybus_interface_type = {
 struct gb_interface *gb_interface_create(struct gb_host_device *hd,
 					 u8 interface_id)
 {
+	struct gb_control *control;
 	struct gb_interface *intf;
 
 	intf = kzalloc(sizeof(*intf), GFP_KERNEL);
@@ -403,11 +404,12 @@ struct gb_interface *gb_interface_create(struct gb_host_device *hd,
 	device_initialize(&intf->dev);
 	dev_set_name(&intf->dev, "%d-%d", hd->bus_id, interface_id);
 
-	intf->control = gb_control_create(intf);
-	if (!intf->control) {
+	control = gb_control_create(intf);
+	if (IS_ERR(control)) {
 		put_device(&intf->dev);
 		return NULL;
 	}
+	intf->control = control;
 
 	list_add(&intf->links, &hd->interfaces);