shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-03 01:36:52 +09:00
Code Issues Packages Projects Releases Wiki Activity

greybus: hid: clean up init error paths

Browse Source 
Separate success and error paths more clearly.

Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Johan Hovold
2016-01-21 17:34:22 +01:00
committed by Greg Kroah-Hartman
parent f7ee081e31
commit 5dd8cc5370
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/greybus/hid.c
View File

@@ -431,7 +431,7 @@ static int gb_hid_connection_init(struct gb_connection *connection)
hid = hid_allocate_device();
if (IS_ERR(hid)) {
ret = PTR_ERR(hid);
goto free_ghid;
goto err_free_ghid;
}
connection->private = ghid;
@@ -440,17 +440,19 @@ static int gb_hid_connection_init(struct gb_connection *connection)
ret = gb_hid_init(ghid);
if (ret)
goto destroy_hid;
goto err_destroy_hid;
ret = hid_add_device(hid);
if (!ret)
return 0;
if (ret) {
hid_err(hid, "can't add hid device: %d\n", ret);
goto err_destroy_hid;
}
hid_err(hid, "can't add hid device: %d\n", ret);
return 0;
destroy_hid:
err_destroy_hid:
hid_destroy_device(hid);
free_ghid:
err_free_ghid:
kfree(ghid);
return ret;