diff options
| author | Johan Hovold <johan@hovoldconsulting.com> | 2016-04-13 19:19:05 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2016-04-21 10:09:03 +0900 |
| commit | b6147e4fb13e926878dbef9adae429faf8d8c2dd (patch) | |
| tree | e0f510b9a87f768d8c592976e1c39b4dc258c242 /drivers/staging/greybus/control.c | |
| parent | 7c8eb12dbb4c1b43ce705a8ba1a5c9c1191e75d8 (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/control.c')
| -rw-r--r-- | drivers/staging/greybus/control.c | 13 |
1 files changed, 8 insertions, 5 deletions
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; |