diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-13 18:29:48 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-13 18:29:48 -0200 |
| commit | 20a16b5ff3c186e90241702dbbc00a25d0b1b9e2 (patch) | |
| tree | 9cf76edcb9951186fccb7d89db0cb45a1bb637b1 /linux/drivers/media/video/saa7134/saa7134-empress.c | |
| parent | 27bdf53f81e7783e79bcd334e4d3d5d329708694 (diff) | |
| parent | 646f5e295e95d6295503fd5b3f5105102c8cc687 (diff) | |
| download | mediapointer-dvb-s2-20a16b5ff3c186e90241702dbbc00a25d0b1b9e2.tar.gz mediapointer-dvb-s2-20a16b5ff3c186e90241702dbbc00a25d0b1b9e2.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-lib
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-empress.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-empress.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-empress.c b/linux/drivers/media/video/saa7134/saa7134-empress.c index 3b0b42545..813f5f88d 100644 --- a/linux/drivers/media/video/saa7134/saa7134-empress.c +++ b/linux/drivers/media/video/saa7134/saa7134-empress.c @@ -352,6 +352,7 @@ static int empress_s_ctrl(struct file *file, void *priv, static int empress_queryctrl(struct file *file, void *priv, struct v4l2_queryctrl *c) { + /* Must be sorted from low to high control ID! */ static const u32 user_ctrls[] = { V4L2_CID_USER_CLASS, V4L2_CID_BRIGHTNESS, @@ -364,6 +365,7 @@ static int empress_queryctrl(struct file *file, void *priv, 0 }; + /* Must be sorted from low to high control ID! */ static const u32 mpeg_ctrls[] = { V4L2_CID_MPEG_CLASS, V4L2_CID_MPEG_STREAM_TYPE, |