Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b83e2508 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] media-device: better name Kernelspace/Userspace links 



The __media_device_enum_links() copies links definitions from
Kernelspace to userspace. It has to work with 3 structs that
handle with links. Better name them to:
	link: Kernelspace internal link representation, of the
		type media_link;
	klink_desc:  struct media_link_desc pointer to the
		kernel memory where the data will be filled;
	ulink_desc:  struct media_link_desc pointer to the
		memory where the data will be copied to
		userspace.

Suggested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 497e80cd

drivers/media/media-device.c

+14 −13
Original line number Diff line number Diff line
@@ -151,24 +151,25 @@ static long __media_device_enum_links(struct media_device *mdev, 
	}



	if (links->links) {

		struct media_link *ent_link;

		struct media_link_desc __user *ulink = links->links;

		struct media_link *link;

		struct media_link_desc __user *ulink_desc = links->links;



		list_for_each_entry(ent_link, &entity->links, list) {

			struct media_link_desc link;

		list_for_each_entry(link, &entity->links, list) {

			struct media_link_desc klink_desc;



			/* Ignore backlinks. */

			if (ent_link->source->entity != entity)

			if (link->source->entity != entity)

				continue;

			memset(&link, 0, sizeof(link));

			media_device_kpad_to_upad(ent_link->source,

						  &link.source);

			media_device_kpad_to_upad(ent_link->sink,

						  &link.sink);

			link.flags = ent_link->flags;

			if (copy_to_user(ulink, &link, sizeof(*ulink)))

			memset(&klink_desc, 0, sizeof(klink_desc));

			media_device_kpad_to_upad(link->source,

						  &klink_desc.source);

			media_device_kpad_to_upad(link->sink,

						  &klink_desc.sink);

			klink_desc.flags = link->flags;

			if (copy_to_user(ulink_desc, &klink_desc,

					 sizeof(*ulink_desc)))

				return -EFAULT;

			ulink++;

			ulink_desc++;

		}

	}