diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-04-19 10:44:18 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-04-19 16:24:53 -0400 |
commit | f70cfc7f182bf4605449cad4d665febf012c6f6b (patch) | |
tree | 2d2f7083887167e64867d53897ea4e6be3d3df78 /drivers/media/video/vivi.c | |
parent | ca57681195265d11b03ea4f98f145e701507ff7a (diff) |
[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) | |||
504 | dev->boolean->cur.val, | 504 | dev->boolean->cur.val, |
505 | dev->menu->qmenu[dev->menu->cur.val], | 505 | dev->menu->qmenu[dev->menu->cur.val], |
506 | dev->string->cur.string); | 506 | dev->string->cur.string); |
507 | gen_text(dev, vbuf, line++ * 16, 16, str); | ||
507 | snprintf(str, sizeof(str), " integer_menu %lld, value %d ", | 508 | snprintf(str, sizeof(str), " integer_menu %lld, value %d ", |
508 | dev->int_menu->qmenu_int[dev->int_menu->cur.val], | 509 | dev->int_menu->qmenu_int[dev->int_menu->cur.val], |
509 | dev->int_menu->cur.val); | 510 | dev->int_menu->cur.val); |
510 | gen_text(dev, vbuf, line++ * 16, 16, str); | 511 | gen_text(dev, vbuf, line++ * 16, 16, str); |
511 | mutex_unlock(&dev->ctrl_handler.lock); | 512 | mutex_unlock(&dev->ctrl_handler.lock); |
512 | gen_text(dev, vbuf, line++ * 16, 16, str); | ||
513 | if (dev->button_pressed) { | 513 | if (dev->button_pressed) { |
514 | dev->button_pressed--; | 514 | dev->button_pressed--; |
515 | snprintf(str, sizeof(str), " button pressed!"); | 515 | snprintf(str, sizeof(str), " button pressed!"); |