Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 15:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

greybus: interface: free bundles on initialisation errors

Browse Source 
Immediately free any created bundle structures on interface
initialisation errors.

Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Reviewed-by: Jeffrey Carlyle <jcarlyle@google.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Johan Hovold 2016-03-09 12:20:37 +01:00 committed by Greg Kroah-Hartman
parent 7a137fb290
commit a77660a75a
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/greybus/interface.c
View File

@ -185,6 +185,7 @@ void gb_interfaces_remove(struct gb_host_device *hd)
*/
int gb_interface_init(struct gb_interface *intf)
{
struct gb_bundle *bundle, *tmp;
int ret, size;
void *manifest;
@ -211,7 +212,7 @@ int gb_interface_init(struct gb_interface *intf)
ret = gb_control_get_manifest_operation(intf, manifest, size);
if (ret) {
dev_err(&intf->dev, "failed to get manifest: %d\n", ret);
goto free_manifest;
goto err_free_manifest;
}
/*
@ -221,18 +222,25 @@ int gb_interface_init(struct gb_interface *intf)
if (!gb_manifest_parse(intf, manifest, size)) {
dev_err(&intf->dev, "failed to parse manifest\n");
ret = -EINVAL;
goto free_manifest;
goto err_destroy_bundles;
}
ret = gb_control_get_interface_version_operation(intf);
if (ret)
goto free_manifest;
goto err_destroy_bundles;
ret = gb_control_get_bundle_versions(intf->control);
if (ret)
goto free_manifest;
goto err_destroy_bundles;
free_manifest:
kfree(manifest);
return 0;
err_destroy_bundles:
list_for_each_entry_safe(bundle, tmp, &intf->bundles, links)
gb_bundle_destroy(bundle);
err_free_manifest:
kfree(manifest);
return ret;