Commit c478c7f4 authored by Frederic Chen's avatar Frederic Chen Committed by Mauro Carvalho Chehab
Browse files

media: mc-device.c: change media_device_request_alloc to match media_ioctl_info 



We modified the type of media_device_request_alloc()'s second
parameter from int* to void* so that it can match the interface
defined in struct media_ioctl_info.

[hverkuil: move #ifdef before variable to avoid compile warning]

Signed-off-by: default avatarFrederic Chen <frederic.chen@mediatek.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 78d95c35

drivers/media/mc/mc-device.c

+4 −3
Original line number Diff line number Diff line
@@ -370,10 +370,11 @@ static long media_device_get_topology(struct media_device *mdev, void *arg) 
	return ret;

}



static long media_device_request_alloc(struct media_device *mdev,

				       int *alloc_fd)

static long media_device_request_alloc(struct media_device *mdev, void *arg)

{

#ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API

	int *alloc_fd = arg;



	if (!mdev->ops || !mdev->ops->req_validate || !mdev->ops->req_queue)

		return -ENOTTY;
@@ -407,7 +408,7 @@ static long copy_arg_to_user(void __user *uarg, void *karg, unsigned int cmd) 
#define MEDIA_IOC_ARG(__cmd, func, fl, from_user, to_user)		\

	[_IOC_NR(MEDIA_IOC_##__cmd)] = {				\

		.cmd = MEDIA_IOC_##__cmd,				\

		.fn = (long (*)(struct media_device *, void *))func,	\

		.fn = func,						\

		.flags = fl,						\

		.arg_from_user = from_user,				\

		.arg_to_user = to_user,					\