summaryrefslogtreecommitdiff
path: root/drivers/staging/greybus/interface.c
diff options
context:
space:
mode:
authorJohan Hovold <johan@hovoldconsulting.com>2016-04-13 19:19:05 +0200
committerGreg Kroah-Hartman <gregkh@google.com>2016-04-21 10:09:03 +0900
commitb6147e4fb13e926878dbef9adae429faf8d8c2dd (patch)
treee0f510b9a87f768d8c592976e1c39b4dc258c242 /drivers/staging/greybus/interface.c
parent7c8eb12dbb4c1b43ce705a8ba1a5c9c1191e75d8 (diff)
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>
Diffstat (limited to 'drivers/staging/greybus/interface.c')
-rw-r--r--drivers/staging/greybus/interface.c6
1 files changed, 4 insertions, 2 deletions
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);