Commit 7a286cc1 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] return -ENOTTY for unsupported ioctl's at legacy drivers 



Those drivers are not relying at the V4L2 core to handle the ioctl's.
So, we need to manually patch them every time a change goes to the
core.

Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-By: default avatarMike Isely <isely@pobox.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 9190d191

drivers/media/video/et61x251/et61x251_core.c

+1 −9
Original line number Diff line number Diff line
@@ -2480,16 +2480,8 @@ static long et61x251_ioctl_v4l2(struct file *filp, 
	case VIDIOC_S_PARM:

		return et61x251_vidioc_s_parm(cam, arg);



	case VIDIOC_G_STD:

	case VIDIOC_S_STD:

	case VIDIOC_QUERYSTD:

	case VIDIOC_ENUMSTD:

	case VIDIOC_QUERYMENU:

	case VIDIOC_ENUM_FRAMEINTERVALS:

		return -EINVAL;



	default:

		return -EINVAL;

		return -ENOTTY;



	}

}

drivers/media/video/pvrusb2/pvrusb2-v4l2.c

+1 −6
Original line number Diff line number Diff line
@@ -369,11 +369,6 @@ static long pvr2_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) 
		break;

	}



	case VIDIOC_S_AUDIO:

	{

		ret = -EINVAL;

		break;

	}

	case VIDIOC_G_TUNER:

	{

		struct v4l2_tuner *vt = (struct v4l2_tuner *)arg;
@@ -850,7 +845,7 @@ static long pvr2_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg) 
#endif



	default :

		ret = -EINVAL;

		ret = -ENOTTY;

		break;

	}

drivers/media/video/sn9c102/sn9c102_core.c

+1 −9
Original line number Diff line number Diff line
@@ -3187,16 +3187,8 @@ static long sn9c102_ioctl_v4l2(struct file *filp, 
	case VIDIOC_S_AUDIO:

		return sn9c102_vidioc_s_audio(cam, arg);



	case VIDIOC_G_STD:

	case VIDIOC_S_STD:

	case VIDIOC_QUERYSTD:

	case VIDIOC_ENUMSTD:

	case VIDIOC_QUERYMENU:

	case VIDIOC_ENUM_FRAMEINTERVALS:

		return -EINVAL;



	default:

		return -EINVAL;

		return -ENOTTY;



	}

}

drivers/media/video/uvc/uvc_v4l2.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static int uvc_ioctl_ctrl_map(struct uvc_video_chain *chain, 
	default:

		uvc_trace(UVC_TRACE_CONTROL, "Unsupported V4L2 control type "

			  "%u.\n", xmap->v4l2_type);

		ret = -EINVAL;

		ret = -ENOTTY;

		goto done;

	}