From: Alex Elder <elder@linaro.org>
Date: Fri, 22 May 2015 14:52:45 +0000 (-0500)
Subject: greybus: core: return error code when creating host device
X-Git-Tag: v4.9-rc1~119^2~378^2~21^2~1521^2~9
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8ea70fe0497c5dd11451e7cf1084844cbdb2a349;p=karo-tx-linux.git

greybus: core: return error code when creating host device

Return a pointer-coded error from greybus_create_hd() rather
than NULL in the event an error occurs.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/drivers/staging/greybus/core.c b/drivers/staging/greybus/core.c
index 95d8c70cf20d..7bfdbadb6250 100644
--- a/drivers/staging/greybus/core.c
+++ b/drivers/staging/greybus/core.c
@@ -187,7 +187,7 @@ struct greybus_host_device *greybus_create_hd(struct greybus_host_driver *driver
 	if ((!driver->message_send) || (!driver->message_cancel) ||
 	    (!driver->submit_svc)) {
 		pr_err("Must implement all greybus_host_driver callbacks!\n");
-		return NULL;
+		return ERR_PTR(-EINVAL);
 	}
 
 	/*
@@ -202,7 +202,7 @@ struct greybus_host_device *greybus_create_hd(struct greybus_host_driver *driver
 
 	hd = kzalloc(sizeof(*hd) + driver->hd_priv_size, GFP_KERNEL);
 	if (!hd)
-		return NULL;
+		return ERR_PTR(-ENOMEM);
 
 	kref_init(&hd->kref);
 	hd->parent = parent;
@@ -215,7 +215,7 @@ struct greybus_host_device *greybus_create_hd(struct greybus_host_driver *driver
 	endo = gb_endo_create(hd, endo_id);
 	if (IS_ERR(endo)) {
 		greybus_remove_hd(hd);
-		return NULL;
+		return ERR_CAST(endo);
 	}
 	hd->endo = endo;
 
diff --git a/drivers/staging/greybus/es1.c b/drivers/staging/greybus/es1.c
index e0fae26d8ba3..1ed10f4b8e49 100644
--- a/drivers/staging/greybus/es1.c
+++ b/drivers/staging/greybus/es1.c
@@ -556,9 +556,9 @@ static int ap_probe(struct usb_interface *interface,
 	udev = usb_get_dev(interface_to_usbdev(interface));
 
 	hd = greybus_create_hd(&es1_driver, &udev->dev, ES1_GBUF_MSG_SIZE_MAX);
-	if (!hd) {
+	if (IS_ERR(hd)) {
 		usb_put_dev(udev);
-		return -ENOMEM;
+		return PTR_ERR(hd);
 	}
 
 	es1 = hd_to_es1(hd);
diff --git a/drivers/staging/greybus/es2.c b/drivers/staging/greybus/es2.c
index 05aac3d7686b..4733adcb8a22 100644
--- a/drivers/staging/greybus/es2.c
+++ b/drivers/staging/greybus/es2.c
@@ -556,9 +556,9 @@ static int ap_probe(struct usb_interface *interface,
 	udev = usb_get_dev(interface_to_usbdev(interface));
 
 	hd = greybus_create_hd(&es1_driver, &udev->dev, ES1_GBUF_MSG_SIZE_MAX);
-	if (!hd) {
+	if (IS_ERR(hd)) {
 		usb_put_dev(udev);
-		return -ENOMEM;
+		return PTR_ERR(hd);
 	}
 
 	es1 = hd_to_es1(hd);