Commit 5dd8cc53 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

greybus: hid: clean up init error paths

Separate success and error paths more clearly.
Reviewed-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent f7ee081e
...@@ -431,7 +431,7 @@ static int gb_hid_connection_init(struct gb_connection *connection) ...@@ -431,7 +431,7 @@ static int gb_hid_connection_init(struct gb_connection *connection)
hid = hid_allocate_device(); hid = hid_allocate_device();
if (IS_ERR(hid)) { if (IS_ERR(hid)) {
ret = PTR_ERR(hid); ret = PTR_ERR(hid);
goto free_ghid; goto err_free_ghid;
} }
connection->private = ghid; connection->private = ghid;
...@@ -440,17 +440,19 @@ static int gb_hid_connection_init(struct gb_connection *connection) ...@@ -440,17 +440,19 @@ static int gb_hid_connection_init(struct gb_connection *connection)
ret = gb_hid_init(ghid); ret = gb_hid_init(ghid);
if (ret) if (ret)
goto destroy_hid; goto err_destroy_hid;
ret = hid_add_device(hid); ret = hid_add_device(hid);
if (!ret) if (ret) {
return 0;
hid_err(hid, "can't add hid device: %d\n", ret); hid_err(hid, "can't add hid device: %d\n", ret);
goto err_destroy_hid;
}
return 0;
destroy_hid: err_destroy_hid:
hid_destroy_device(hid); hid_destroy_device(hid);
free_ghid: err_free_ghid:
kfree(ghid); kfree(ghid);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment