@@ -863,14 +863,14 @@ static int set_config(struct usb_composite_dev *cdev,
const struct usb_ctrlrequest *ctrl, unsigned number)
{
struct usb_gadget *gadget = cdev->gadget;
- struct usb_configuration *c = NULL;
+ struct usb_configuration *c = NULL, *iter;
int result = -EINVAL;
unsigned power = gadget_is_otg(gadget) ? 8 : 100;
int tmp;
if (number) {
- list_for_each_entry(c, &cdev->configs, list) {
- if (c->bConfigurationValue == number) {
+ list_for_each_entry(iter, &cdev->configs, list) {
+ if (iter->bConfigurationValue == number) {
/*
* We disable the FDs of the previous
* configuration only if the new configuration
@@ -878,11 +878,12 @@ static int set_config(struct usb_composite_dev *cdev,
*/
if (cdev->config)
reset_config(cdev);
+ c = iter;
result = 0;
break;
}
}
- if (result < 0)
+ if (!c)
goto done;
} else { /* Zero configuration value - need to reset the config */
if (cdev->config)
To move the list iterator variable into the list_for_each_entry_*() macro in the future it should be avoided to use the list iterator variable after the loop body. To *never* use the list iterator variable after the loop it was concluded to use a separate iterator variable [1]. This removes the need to check the rc value to determine if the break/goto was hit and can be made more obvious by checking if the variable was set within the list traversal loop. Link: https://lore.kernel.org/all/YhdfEIwI4EdtHdym@kroah.com/ Signed-off-by: Jakob Koschel <jakobkoschel@gmail.com> --- drivers/usb/gadget/composite.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)