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

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

[media] media-device: Simplify compat32 logic 



Only MEDIA_IOC_ENUM_LINKS32 require an special logic when
userspace is 32 bits and Kernel is 64 bits.

For the rest, media_device_ioctl() will do the right thing,
and will return -ENOIOCTLCMD if the ioctl is unknown.

Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 00303f91

drivers/media/media-device.c

+1 −7
Original line number Diff line number Diff line
@@ -499,12 +499,6 @@ static long media_device_compat_ioctl(struct file *filp, unsigned int cmd, 
	long ret;



	switch (cmd) {

	case MEDIA_IOC_DEVICE_INFO:

	case MEDIA_IOC_ENUM_ENTITIES:

	case MEDIA_IOC_SETUP_LINK:

	case MEDIA_IOC_G_TOPOLOGY:

		return media_device_ioctl(filp, cmd, arg);



	case MEDIA_IOC_ENUM_LINKS32:

		mutex_lock(&dev->graph_mutex);

		ret = media_device_enum_links32(dev,
@@ -513,7 +507,7 @@ static long media_device_compat_ioctl(struct file *filp, unsigned int cmd, 
		break;



	default:

		ret = -ENOIOCTLCMD;

		return media_device_ioctl(filp, cmd, arg);

	}



	return ret;