From: Hans Verkuil Date: Thu, 19 Apr 2012 14:44:18 +0000 (-0300) Subject: [media] vivi: fix duplicate line X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f70cfc7f182bf4605449cad4d665febf012c6f6b;p=linux-beck.git [media] vivi: fix duplicate line This was inadvertently introduced when the integer menu control was added. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- 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!");