4 files changed, 47 insertions, 4 deletions

diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig
index 06ca75911b7f..769c6f8142d2 100644
--- a/drivers/media/common/Kconfig
+++ b/drivers/media/common/Kconfig
@@ -4,6 +4,6 @@ config VIDEO_SAA7146
 
 config VIDEO_SAA7146_VV
         tristate
-        depends on VIDEO_DEV
+        depends on VIDEO_V4L2
         select VIDEOBUF_DMA_SG
         select VIDEO_SAA7146
diff --git a/drivers/media/common/ir-keymaps.c b/drivers/media/common/ir-keymaps.c
index a4a937c90534..2ab5a120470d 100644
--- a/drivers/media/common/ir-keymaps.c
+++ b/drivers/media/common/ir-keymaps.c
@@ -1987,3 +1987,49 @@ IR_KEYTAB_TYPE ir_codes_behold[IR_KEYTAB_SIZE] = {
 };
 
 EXPORT_SYMBOL_GPL(ir_codes_behold);
+
+/*
+ * Remote control for the Genius TVGO A11MCE
+ * Adrian Pardini <pardo.bsso@gmail.com>
+ */
+IR_KEYTAB_TYPE ir_codes_genius_tvgo_a11mce[IR_KEYTAB_SIZE] = {
+        /* Keys 0 to 9 */
+        [0x48] = KEY_0,
+        [0x09] = KEY_1,
+        [0x1d] = KEY_2,
+        [0x1f] = KEY_3,
+        [0x19] = KEY_4,
+        [0x1b] = KEY_5,
+        [0x11] = KEY_6,
+        [0x17] = KEY_7,
+        [0x12] = KEY_8,
+        [0x16] = KEY_9,
+
+        [0x54] = KEY_RECORD,            /* recording */
+        [0x06] = KEY_MUTE,              /* mute */
+        [0x10] = KEY_POWER,
+        [0x40] = KEY_LAST,              /* recall */
+        [0x4c] = KEY_CHANNELUP,         /* channel / program + */
+        [0x00] = KEY_CHANNELDOWN,       /* channel / program - */
+        [0x0d] = KEY_VOLUMEUP,
+        [0x15] = KEY_VOLUMEDOWN,
+        [0x4d] = KEY_OK,                /* also labeled as Pause */
+        [0x1c] = KEY_ZOOM,              /* full screen and Stop*/
+        [0x02] = KEY_MODE,              /* AV Source or Rewind*/
+        [0x04] = KEY_LIST,              /* -/-- */
+        /* small arrows above numbers */
+        [0x1a] = KEY_NEXT,              /* also Fast Forward */
+        [0x0e] = KEY_PREVIOUS,  /* also Rewind */
+        /* these are in a rather non standard layout and have
+        an alternate name written */
+        [0x1e] = KEY_UP,                /* Video Setting */
+        [0x0a] = KEY_DOWN,              /* Video Default */
+        [0x05] = KEY_LEFT,              /* Snapshot */
+        [0x0c] = KEY_RIGHT,             /* Hide Panel */
+        /* Four buttons without label */
+        [0x49] = KEY_RED,
+        [0x0b] = KEY_GREEN,
+        [0x13] = KEY_YELLOW,
+        [0x50] = KEY_BLUE,
+};
+EXPORT_SYMBOL_GPL(ir_codes_genius_tvgo_a11mce);
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c
index c32dda973e92..bfbd5a841ebf 100644
--- a/drivers/media/common/saa7146_vbi.c
+++ b/drivers/media/common/saa7146_vbi.c
@@ -413,7 +413,6 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file)
                             V4L2_FIELD_SEQ_TB, // FIXME: does this really work?
                             sizeof(struct saa7146_buf),
                             file);
-        mutex_init(&fh->vbi_q.lock);
 
         init_timer(&fh->vbi_read_timeout);
         fh->vbi_read_timeout.function = vbi_read_timeout;
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index c31ab480d8e1..66fdbd0e6a6d 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -1417,8 +1417,6 @@ static int video_open(struct saa7146_dev *dev, struct file *file)
                             sizeof(struct saa7146_buf),
                             file);
 
-        mutex_init(&fh->video_q.lock);
-
         return 0;
 }