Commit 252d50da authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Laurent Pinchart
Browse files

media: uvcvideo: Refactor __uvc_ctrl_add_mapping 



Simplify the exit code with a common error tag freeing all the memory.

Suggested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent 7faf8ae4

drivers/media/usb/uvc/uvc_ctrl.c

+15 −11
Original line number Diff line number Diff line
@@ -2286,32 +2286,30 @@ static int __uvc_ctrl_add_mapping(struct uvc_video_chain *chain, 
	unsigned int i;



	/*

	 * Most mappings come from static kernel data and need to be duplicated.

	 * Most mappings come from static kernel data, and need to be duplicated.

	 * Mappings that come from userspace will be unnecessarily duplicated,

	 * this could be optimized.

	 */

	map = kmemdup(mapping, sizeof(*mapping), GFP_KERNEL);

	if (map == NULL)

	if (!map)

		return -ENOMEM;



	map->name = NULL;

	map->menu_info = NULL;



	/* For UVCIOC_CTRL_MAP custom control */

	if (mapping->name) {

		map->name = kstrdup(mapping->name, GFP_KERNEL);

		if (!map->name) {

			kfree(map);

			return -ENOMEM;

		}

		if (!map->name)

			goto err_nomem;

	}



	INIT_LIST_HEAD(&map->ev_subs);



	size = sizeof(*mapping->menu_info) * mapping->menu_count;

	map->menu_info = kmemdup(mapping->menu_info, size, GFP_KERNEL);

	if (map->menu_info == NULL) {

		kfree(map->name);

		kfree(map);

		return -ENOMEM;

	}

	if (!map->menu_info)

		goto err_nomem;



	if (map->get == NULL)

		map->get = uvc_get_le_value;
@@ -2332,6 +2330,12 @@ static int __uvc_ctrl_add_mapping(struct uvc_video_chain *chain, 
		ctrl->info.selector);



	return 0;



err_nomem:

	kfree(map->menu_info);

	kfree(map->name);

	kfree(map);

	return -ENOMEM;

}



int uvc_ctrl_add_mapping(struct uvc_video_chain *chain,