diff options
Diffstat (limited to 'drivers/media/video/v4l2-ctrls.c')
-rw-r--r-- | drivers/media/video/v4l2-ctrls.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/media/video/v4l2-ctrls.c b/drivers/media/video/v4l2-ctrls.c index b63fe2a17fce..a37e5bff4342 100644 --- a/drivers/media/video/v4l2-ctrls.c +++ b/drivers/media/video/v4l2-ctrls.c | |||
@@ -1011,7 +1011,6 @@ static int handler_new_ref(struct v4l2_ctrl_handler *hdl, | |||
1011 | insertion is an O(1) operation. */ | 1011 | insertion is an O(1) operation. */ |
1012 | if (list_empty(&hdl->ctrl_refs) || id > node2id(hdl->ctrl_refs.prev)) { | 1012 | if (list_empty(&hdl->ctrl_refs) || id > node2id(hdl->ctrl_refs.prev)) { |
1013 | list_add_tail(&new_ref->node, &hdl->ctrl_refs); | 1013 | list_add_tail(&new_ref->node, &hdl->ctrl_refs); |
1014 | hdl->nr_of_refs++; | ||
1015 | goto insert_in_hash; | 1014 | goto insert_in_hash; |
1016 | } | 1015 | } |
1017 | 1016 | ||
@@ -2051,20 +2050,3 @@ void v4l2_ctrl_del_event(struct v4l2_ctrl *ctrl, | |||
2051 | v4l2_ctrl_unlock(ctrl); | 2050 | v4l2_ctrl_unlock(ctrl); |
2052 | } | 2051 | } |
2053 | EXPORT_SYMBOL(v4l2_ctrl_del_event); | 2052 | EXPORT_SYMBOL(v4l2_ctrl_del_event); |
2054 | |||
2055 | int v4l2_ctrl_subscribe_fh(struct v4l2_fh *fh, | ||
2056 | struct v4l2_event_subscription *sub, unsigned n) | ||
2057 | { | ||
2058 | struct v4l2_ctrl_handler *hdl = fh->ctrl_handler; | ||
2059 | int ret = 0; | ||
2060 | |||
2061 | if (!ret) { | ||
2062 | if (hdl->nr_of_refs * 2 > n) | ||
2063 | n = hdl->nr_of_refs * 2; | ||
2064 | ret = v4l2_event_alloc(fh, n); | ||
2065 | } | ||
2066 | if (!ret) | ||
2067 | ret = v4l2_event_subscribe(fh, sub); | ||
2068 | return ret; | ||
2069 | } | ||
2070 | EXPORT_SYMBOL(v4l2_ctrl_subscribe_fh); | ||