]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
[media] vivi: fix duplicate line
authorHans Verkuil <hans.verkuil@cisco.com>
Thu, 19 Apr 2012 14:44:18 +0000 (11:44 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 19 Apr 2012 20:24:53 +0000 (17:24 -0300)
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>
drivers/media/video/vivi.c

index ff39eb2f2d7b19204668e305cc8e8271afe8d0cf..d64d482f4f6b964a3e12cbe3bd47a79e91d1ce9c 100644 (file)
@@ -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!");