| Message ID | 1357910040-27463-2-git-send-email-laurent.pinchart@ideasonboard.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri January 11 2013 14:13:58 Laurent Pinchart wrote: > Commit ba68c8530a263dc4de440fa10bb20a1c5b9d4ff5 (Partly revert "[media] > uvcvideo: Set error_idx properly for extended controls API failures") > also reverted commit 30ecb936cbcd83e3735625ac63e1b4466546f5fe > ("uvcvideo: Return -EACCES when trying to access a read/write-only > control") by mistake. Fix it. > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Hans Verkuil <hans.verkuil@cisco.com> > --- > drivers/media/usb/uvc/uvc_ctrl.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c > index 2bb7613..d5baab1 100644 > --- a/drivers/media/usb/uvc/uvc_ctrl.c > +++ b/drivers/media/usb/uvc/uvc_ctrl.c > @@ -1431,8 +1431,10 @@ int uvc_ctrl_set(struct uvc_video_chain *chain, > int ret; > > ctrl = uvc_find_control(chain, xctrl->id, &mapping); > - if (ctrl == NULL || (ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR) == 0) > + if (ctrl == NULL) > return -EINVAL; > + if (!(ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR)) > + return -EACCES; > > /* Clamp out of range values. */ > switch (mapping->v4l2_type) { > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri January 11 2013 14:21:40 Hans Verkuil wrote: > On Fri January 11 2013 14:13:58 Laurent Pinchart wrote: > > Commit ba68c8530a263dc4de440fa10bb20a1c5b9d4ff5 (Partly revert "[media] > > uvcvideo: Set error_idx properly for extended controls API failures") > > also reverted commit 30ecb936cbcd83e3735625ac63e1b4466546f5fe > > ("uvcvideo: Return -EACCES when trying to access a read/write-only > > control") by mistake. Fix it. > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > Acked-by: Hans Verkuil <hans.verkuil@cisco.com> Actually, I need a clarification first: the code only checks for access to a read-only control, but the patch title says: "Return -EACCES when trying to access a read/write-only control", so either there is something missing in the patch, or the patch title is wrong. I suspect it is just the title that is wrong. Regards, Hans > > > --- > > drivers/media/usb/uvc/uvc_ctrl.c | 4 +++- > > 1 files changed, 3 insertions(+), 1 deletions(-) > > > > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c > > index 2bb7613..d5baab1 100644 > > --- a/drivers/media/usb/uvc/uvc_ctrl.c > > +++ b/drivers/media/usb/uvc/uvc_ctrl.c > > @@ -1431,8 +1431,10 @@ int uvc_ctrl_set(struct uvc_video_chain *chain, > > int ret; > > > > ctrl = uvc_find_control(chain, xctrl->id, &mapping); > > - if (ctrl == NULL || (ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR) == 0) > > + if (ctrl == NULL) > > return -EINVAL; > > + if (!(ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR)) > > + return -EACCES; > > > > /* Clamp out of range values. */ > > switch (mapping->v4l2_type) { > > > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Hans, On Friday 11 January 2013 14:26:28 Hans Verkuil wrote: > On Fri January 11 2013 14:21:40 Hans Verkuil wrote: > > On Fri January 11 2013 14:13:58 Laurent Pinchart wrote: > > > Commit ba68c8530a263dc4de440fa10bb20a1c5b9d4ff5 (Partly revert "[media] > > > uvcvideo: Set error_idx properly for extended controls API failures") > > > also reverted commit 30ecb936cbcd83e3735625ac63e1b4466546f5fe > > > ("uvcvideo: Return -EACCES when trying to access a read/write-only > > > control") by mistake. Fix it. > > > > > > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > > > Acked-by: Hans Verkuil <hans.verkuil@cisco.com> > > Actually, I need a clarification first: the code only checks for access to > a read-only control, but the patch title says: "Return -EACCES when trying > to access a read/write-only control", so either there is something missing > in the patch, or the patch title is wrong. > > I suspect it is just the title that is wrong. Yes, the title is wrong. The original commit handled both, and ba68c8530a263dc4de440fa10bb20a1c5b9d4ff5 reverted only half of it. I'll send a v2 with a fixed title.
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index 2bb7613..d5baab1 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1431,8 +1431,10 @@ int uvc_ctrl_set(struct uvc_video_chain *chain, int ret; ctrl = uvc_find_control(chain, xctrl->id, &mapping); - if (ctrl == NULL || (ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR) == 0) + if (ctrl == NULL) return -EINVAL; + if (!(ctrl->info.flags & UVC_CTRL_FLAG_SET_CUR)) + return -EACCES; /* Clamp out of range values. */ switch (mapping->v4l2_type) {
Commit ba68c8530a263dc4de440fa10bb20a1c5b9d4ff5 (Partly revert "[media] uvcvideo: Set error_idx properly for extended controls API failures") also reverted commit 30ecb936cbcd83e3735625ac63e1b4466546f5fe ("uvcvideo: Return -EACCES when trying to access a read/write-only control") by mistake. Fix it. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- drivers/media/usb/uvc/uvc_ctrl.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)