Re: [PATCH RFCv3 17/17] [media] return -ENOTTY for unsupported ioctl's at legacy drivers

[Laurent Pinchart]

On Wednesday 06 July 2011 20:03:49 Mauro Carvalho Chehab wrote:
> 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.
> 
> Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>

For the uvcvide portion of this patch:

Acked-By: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>

> 
> diff --git a/drivers/media/video/et61x251/et61x251_core.c
> b/drivers/media/video/et61x251/et61x251_core.c index d7efb33..9a1e80a
> 100644
> --- a/drivers/media/video/et61x251/et61x251_core.c
> +++ b/drivers/media/video/et61x251/et61x251_core.c
> @@ -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;
> 
>  	}
>  }
> diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
> b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index 573749a..e27f8ab 100644
> --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
> +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
> @@ -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;
>  	}
> 
> diff --git a/drivers/media/video/sn9c102/sn9c102_core.c
> b/drivers/media/video/sn9c102/sn9c102_core.c index d8eece8..16cb07c 100644
> --- a/drivers/media/video/sn9c102/sn9c102_core.c
> +++ b/drivers/media/video/sn9c102/sn9c102_core.c
> @@ -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;
> 
>  	}
>  }
> diff --git a/drivers/media/video/uvc/uvc_v4l2.c
> b/drivers/media/video/uvc/uvc_v4l2.c index cdd967b..7afb97b 100644
> --- a/drivers/media/video/uvc/uvc_v4l2.c
> +++ b/drivers/media/video/uvc/uvc_v4l2.c
> @@ -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;
>  	}

-- 
Regards,

Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/