diff options
Diffstat (limited to 'drivers/media/video/v4l2-common.c')
-rw-r--r-- | drivers/media/video/v4l2-common.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index b5eb1f3950b1..3f0871b550ad 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c | |||
@@ -150,7 +150,7 @@ EXPORT_SYMBOL(v4l2_prio_check); | |||
150 | struct v4l2_queryctrl and the available menu items. Note that | 150 | struct v4l2_queryctrl and the available menu items. Note that |
151 | menu_items may be NULL, in that case it is ignored. */ | 151 | menu_items may be NULL, in that case it is ignored. */ |
152 | int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl, | 152 | int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl, |
153 | const char **menu_items) | 153 | const char * const *menu_items) |
154 | { | 154 | { |
155 | if (qctrl->flags & V4L2_CTRL_FLAG_DISABLED) | 155 | if (qctrl->flags & V4L2_CTRL_FLAG_DISABLED) |
156 | return -EINVAL; | 156 | return -EINVAL; |
@@ -199,7 +199,7 @@ EXPORT_SYMBOL(v4l2_ctrl_query_fill); | |||
199 | If menu_items is NULL, then the menu items are retrieved using | 199 | If menu_items is NULL, then the menu items are retrieved using |
200 | v4l2_ctrl_get_menu. */ | 200 | v4l2_ctrl_get_menu. */ |
201 | int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qctrl, | 201 | int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qctrl, |
202 | const char **menu_items) | 202 | const char * const *menu_items) |
203 | { | 203 | { |
204 | int i; | 204 | int i; |
205 | 205 | ||
@@ -222,7 +222,7 @@ EXPORT_SYMBOL(v4l2_ctrl_query_menu); | |||
222 | Use this if there are 'holes' in the list of valid menu items. */ | 222 | Use this if there are 'holes' in the list of valid menu items. */ |
223 | int v4l2_ctrl_query_menu_valid_items(struct v4l2_querymenu *qmenu, const u32 *ids) | 223 | int v4l2_ctrl_query_menu_valid_items(struct v4l2_querymenu *qmenu, const u32 *ids) |
224 | { | 224 | { |
225 | const char **menu_items = v4l2_ctrl_get_menu(qmenu->id); | 225 | const char * const *menu_items = v4l2_ctrl_get_menu(qmenu->id); |
226 | 226 | ||
227 | qmenu->reserved = 0; | 227 | qmenu->reserved = 0; |
228 | if (menu_items == NULL || ids == NULL) | 228 | if (menu_items == NULL || ids == NULL) |