1 files changed, 17 insertions, 2 deletions

diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index 3f3c70716268..6bc35eeb653b 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -307,6 +307,14 @@ static const struct {
         /* 0xffdc iMON MCE VFD */
         { 0x00010000ffffffeell, KEY_VOLUMEUP },
         { 0x01000000ffffffeell, KEY_VOLUMEDOWN },
+        { 0x00000001ffffffeell, KEY_MUTE },
+        { 0x0000000fffffffeell, KEY_MEDIA },
+        { 0x00000012ffffffeell, KEY_UP },
+        { 0x00000013ffffffeell, KEY_DOWN },
+        { 0x00000014ffffffeell, KEY_LEFT },
+        { 0x00000015ffffffeell, KEY_RIGHT },
+        { 0x00000016ffffffeell, KEY_ENTER },
+        { 0x00000017ffffffeell, KEY_ESC },
         /* iMON Knob values */
         { 0x000100ffffffffeell, KEY_VOLUMEUP },
         { 0x010000ffffffffeell, KEY_VOLUMEDOWN },
@@ -1582,16 +1590,16 @@ static void imon_incoming_packet(struct imon_context *ictx,
         /* Only panel type events left to process now */
         spin_lock_irqsave(&ictx->kc_lock, flags);
 
+        do_gettimeofday(&t);
         /* KEY_MUTE repeats from knob need to be suppressed */
         if (ictx->kc == KEY_MUTE && ictx->kc == ictx->last_keycode) {
-                do_gettimeofday(&t);
                 msec = tv2int(&t, &prev_time);
-                prev_time = t;
                 if (msec < ictx->idev->rep[REP_DELAY]) {
                         spin_unlock_irqrestore(&ictx->kc_lock, flags);
                         return;
                 }
         }
+        prev_time = t;
         kc = ictx->kc;
 
         spin_unlock_irqrestore(&ictx->kc_lock, flags);
@@ -1603,7 +1611,9 @@ static void imon_incoming_packet(struct imon_context *ictx,
         input_report_key(ictx->idev, kc, 0);
         input_sync(ictx->idev);
 
+        spin_lock_irqsave(&ictx->kc_lock, flags);
         ictx->last_keycode = kc;
+        spin_unlock_irqrestore(&ictx->kc_lock, flags);
 
         return;
 
@@ -1740,6 +1750,8 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
                 detected_display_type = IMON_DISPLAY_TYPE_VFD;
                 break;
         /* iMON VFD, MCE IR */
+        case 0x46:
+        case 0x7e:
         case 0x9e:
                 dev_info(ictx->dev, "0xffdc iMON VFD, MCE IR");
                 detected_display_type = IMON_DISPLAY_TYPE_VFD;
@@ -1755,6 +1767,9 @@ static void imon_get_ffdc_type(struct imon_context *ictx)
                 dev_info(ictx->dev, "Unknown 0xffdc device, "
                          "defaulting to VFD and iMON IR");
                 detected_display_type = IMON_DISPLAY_TYPE_VFD;
+                /* We don't know which one it is, allow user to set the
+                 * RC6 one from userspace if OTHER wasn't correct. */
+                allowed_protos |= RC_TYPE_RC6;
                 break;
         }