struct usb_gadget_strings *strs;
struct usb_configuration **configs;
struct usb_function **funcs;
- int i, j;
+ int i;
int ret = -ENOMEM;
gadget = zalloc(sizeof(*gadget));
if (ret)
goto free_config_1;
- i = 0;
- for (j = 0; configs[0] && configs[0]->funcs[j]; i++, j++)
- gadget->funcs[i] = configs[0]->funcs[j];
-
- for (j = 0; configs[1] && configs[1]->funcs[j]; i++, j++)
- gadget->funcs[i] = configs[1]->funcs[j];
-
*_gadget = gadget;
return 0;
goto disable_gadget;
for (i = 0; gadget->funcs[i]; ++i) {
- if (gadget->funcs[i]->function_group != USB_FUNCTION_GROUP_WITH_SERVICE)
+ if (gadget->funcs[i]->function_group !=
+ USB_FUNCTION_GROUP_WITH_SERVICE)
continue;
- fws = container_of(gadget->funcs[i], struct usb_function_with_service, func);
+ fws = container_of(gadget->funcs[i],
+ struct usb_function_with_service, func);
ret = systemd_start_service(fws->service);
if (ret < 0)
- _E("start service failed: %s", fws->service);
+ goto stop_services;
}
- // TODO. free gadget
- // legacy_free_gadget(gadget);
return 0;
+stop_services:
+ while (--i >= 0) {
+ if (gadget->funcs[i]->function_group !=
+ USB_FUNCTION_GROUP_WITH_SERVICE)
+ continue;
+
+ fws = container_of(gadget->funcs[i],
+ struct usb_function_with_service, func);
+ systemd_stop_service(fws->service);
+ }
disable_gadget:
sys_set_str(LEGACY_ENABLE_PATH, LEGACY_DISABLE);
-
- // TODO. free gadget
- // legacy_free_gadget(gadget);
return ret;
}
fws = container_of(gadget->funcs[i], struct usb_function_with_service, func);
ret = systemd_stop_service(fws->service);
if (ret < 0)
- _E("stop service failed: %s", fws->service);
+ return ret;
}
- // TODO. free gadget
- // legacy_free_gadget(gadget);
return sys_set_str(LEGACY_ENABLE_PATH, LEGACY_DISABLE);
}