diff options
| author | Hans Verkuil | 2012-04-19 16:44:18 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2012-04-19 22:24:53 +0200 |
| commit | f70cfc7f182bf4605449cad4d665febf012c6f6b (patch) | |
| tree | 2d2f7083887167e64867d53897ea4e6be3d3df78 /drivers/media/video/vivi.c | |
| parent | [media] v4l2-ctrls.c: zero min/max/step/def values for 64 bit integers (diff) | |
| download | kernel-qcow2-linux-f70cfc7f182bf4605449cad4d665febf012c6f6b.tar.gz kernel-qcow2-linux-f70cfc7f182bf4605449cad4d665febf012c6f6b.tar.xz kernel-qcow2-linux-f70cfc7f182bf4605449cad4d665febf012c6f6b.zip | |
[media] vivi: fix duplicate line
This was inadvertently introduced when the integer menu control was added.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/vivi.c')
| -rw-r--r-- | drivers/media/video/vivi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index ff39eb2f2d7b..d64d482f4f6b 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c @@ -504,12 +504,12 @@ static void vivi_fillbuff(struct vivi_dev *dev, struct vivi_buffer *buf) dev->boolean->cur.val, dev->menu->qmenu[dev->menu->cur.val], dev->string->cur.string); + gen_text(dev, vbuf, line++ * 16, 16, str); snprintf(str, sizeof(str), " integer_menu %lld, value %d ", dev->int_menu->qmenu_int[dev->int_menu->cur.val], dev->int_menu->cur.val); gen_text(dev, vbuf, line++ * 16, 16, str); mutex_unlock(&dev->ctrl_handler.lock); - gen_text(dev, vbuf, line++ * 16, 16, str); if (dev->button_pressed) { dev->button_pressed--; snprintf(str, sizeof(str), " button pressed!"); |