2 files changed, 35 insertions, 35 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-input.c b/drivers/media/pci/saa7134/saa7134-input.c
index 43dd8bda02e1..887429ba299b 100644
--- a/drivers/media/pci/saa7134/saa7134-input.c
+++ b/drivers/media/pci/saa7134/saa7134-input.c
@@ -346,7 +346,7 @@ static int get_key_beholdm6xx(struct IR_i2c *ir, enum rc_type *protocol,
                return 0;
        *protocol = RC_TYPE_NEC;
-        *scancode = RC_SCANCODE_NECX(((data[10] << 8) | data[11]), data[9]);
+        *scancode = RC_SCANCODE_NECX(data[11] << 8 | data[10], data[9]);
        *toggle = 0;
        return 1;
 }
diff --git a/drivers/media/rc/keymaps/rc-behold.c b/drivers/media/rc/keymaps/rc-behold.c
index d6519f8ac95a..520a96f2ff86 100644
--- a/drivers/media/rc/keymaps/rc-behold.c
+++ b/drivers/media/rc/keymaps/rc-behold.c
@@ -30,8 +30,8 @@ static struct rc_map_table behold[] = {
        /*  0x1c            0x12  *
         *  TV/FM          POWER  *
         *                        */
-        { 0x6b861c, KEY_TUNER },        /* XXX KEY_TV / KEY_RADIO */
+        { 0x866b1c, KEY_TUNER },        /* XXX KEY_TV / KEY_RADIO */
-        { 0x6b8612, KEY_POWER },
+        { 0x866b12, KEY_POWER },
        /*  0x01    0x02    0x03  *
         *   1       2       3    *
@@ -42,28 +42,28 @@ static struct rc_map_table behold[] = {
         *  0x07    0x08    0x09  *
         *   7       8       9    *
         *                        */
-        { 0x6b8601, KEY_1 },
+        { 0x866b01, KEY_1 },
-        { 0x6b8602, KEY_2 },
+        { 0x866b02, KEY_2 },
-        { 0x6b8603, KEY_3 },
+        { 0x866b03, KEY_3 },
-        { 0x6b8604, KEY_4 },
+        { 0x866b04, KEY_4 },
-        { 0x6b8605, KEY_5 },
+        { 0x866b05, KEY_5 },
-        { 0x6b8606, KEY_6 },
+        { 0x866b06, KEY_6 },
-        { 0x6b8607, KEY_7 },
+        { 0x866b07, KEY_7 },
-        { 0x6b8608, KEY_8 },
+        { 0x866b08, KEY_8 },
-        { 0x6b8609, KEY_9 },
+        { 0x866b09, KEY_9 },
        /*  0x0a    0x00    0x17  *
         * RECALL    0      MODE  *
         *                        */
-        { 0x6b860a, KEY_AGAIN },
+        { 0x866b0a, KEY_AGAIN },
-        { 0x6b8600, KEY_0 },
+        { 0x866b00, KEY_0 },
-        { 0x6b8617, KEY_MODE },
+        { 0x866b17, KEY_MODE },
        /*  0x14          0x10    *
         * ASPECT      FULLSCREEN *
         *                        */
-        { 0x6b8614, KEY_SCREEN },
+        { 0x866b14, KEY_SCREEN },
-        { 0x6b8610, KEY_ZOOM },
+        { 0x866b10, KEY_ZOOM },
        /*          0x0b          *
         *           Up           *
@@ -74,17 +74,17 @@ static struct rc_map_table behold[] = {
         *         0x015          *
         *         Down           *
         *                        */
-        { 0x6b860b, KEY_CHANNELUP },
+        { 0x866b0b, KEY_CHANNELUP },
-        { 0x6b8618, KEY_VOLUMEDOWN },
+        { 0x866b18, KEY_VOLUMEDOWN },
-        { 0x6b8616, KEY_OK },           /* XXX KEY_ENTER */
+        { 0x866b16, KEY_OK },           /* XXX KEY_ENTER */
-        { 0x6b860c, KEY_VOLUMEUP },
+        { 0x866b0c, KEY_VOLUMEUP },
-        { 0x6b8615, KEY_CHANNELDOWN },
+        { 0x866b15, KEY_CHANNELDOWN },
        /*  0x11            0x0d  *
         *  MUTE            INFO  *
         *                        */
-        { 0x6b8611, KEY_MUTE },
+        { 0x866b11, KEY_MUTE },
-        { 0x6b860d, KEY_INFO },
+        { 0x866b0d, KEY_INFO },
        /*  0x0f    0x1b    0x1a  *
         * RECORD PLAY/PAUSE STOP *
@@ -93,26 +93,26 @@ static struct rc_map_table behold[] = {
         *TELETEXT  AUDIO  SOURCE *
         *           RED   YELLOW *
         *                        */
-        { 0x6b860f, KEY_RECORD },
+        { 0x866b0f, KEY_RECORD },
-        { 0x6b861b, KEY_PLAYPAUSE },
+        { 0x866b1b, KEY_PLAYPAUSE },
-        { 0x6b861a, KEY_STOP },
+        { 0x866b1a, KEY_STOP },
-        { 0x6b860e, KEY_TEXT },
+        { 0x866b0e, KEY_TEXT },
-        { 0x6b861f, KEY_RED },  /*XXX KEY_AUDIO */
+        { 0x866b1f, KEY_RED },  /*XXX KEY_AUDIO */
-        { 0x6b861e, KEY_VIDEO },
+        { 0x866b1e, KEY_VIDEO },
        /*  0x1d   0x13     0x19  *
         * SLEEP  PREVIEW   DVB   *
         *         GREEN    BLUE  *
         *                        */
-        { 0x6b861d, KEY_SLEEP },
+        { 0x866b1d, KEY_SLEEP },
-        { 0x6b8613, KEY_GREEN },
+        { 0x866b13, KEY_GREEN },
-        { 0x6b8619, KEY_BLUE }, /* XXX KEY_SAT  */
+        { 0x866b19, KEY_BLUE }, /* XXX KEY_SAT  */
        /*  0x58           0x5c   *
         * FREEZE        SNAPSHOT *
         *                        */
-        { 0x6b8658, KEY_SLOW },
+        { 0x866b58, KEY_SLOW },
-        { 0x6b865c, KEY_CAMERA },
+        { 0x866b5c, KEY_CAMERA },
 };

diff --git a/drivers/media/pci/saa7134/saa7134-input.c b/drivers/media/pci/saa7134/saa7134-input.c index 43dd8bda02e1..887429ba299b 100644 --- a/drivers/media/pci/saa7134/saa7134-input.c +++ b/drivers/media/pci/saa7134/saa7134-input.c
@@ -346,7 +346,7 @@ static int get_key_beholdm6xx(struct IR_i2c ir, enum rc_type protocol,
346	return 0;	346	return 0;
347		347
348	*protocol = RC_TYPE_NEC;	348	*protocol = RC_TYPE_NEC;
349	*scancode = RC_SCANCODE_NECX(((data[10] << 8) \| data[11]), data[9]);	349	*scancode = RC_SCANCODE_NECX(data[11] << 8 \| data[10], data[9]);
350	*toggle = 0;	350	*toggle = 0;
351	return 1;	351	return 1;
352	}	352	}


diff --git a/drivers/media/rc/keymaps/rc-behold.c b/drivers/media/rc/keymaps/rc-behold.c index d6519f8ac95a..520a96f2ff86 100644 --- a/drivers/media/rc/keymaps/rc-behold.c +++ b/drivers/media/rc/keymaps/rc-behold.c
@@ -30,8 +30,8 @@ static struct rc_map_table behold[] = {
30	/* 0x1c 0x12 *	30	/* 0x1c 0x12 *
31	* TV/FM POWER *	31	* TV/FM POWER *
32	* */	32	* */
33	{ 0x6b861c, KEY_TUNER }, /* XXX KEY_TV / KEY_RADIO */	33	{ 0x866b1c, KEY_TUNER }, /* XXX KEY_TV / KEY_RADIO */
34	{ 0x6b8612, KEY_POWER },	34	{ 0x866b12, KEY_POWER },
35		35
36	/* 0x01 0x02 0x03 *	36	/* 0x01 0x02 0x03 *
37	* 1 2 3 *	37	* 1 2 3 *
@@ -42,28 +42,28 @@ static struct rc_map_table behold[] = {
42	* 0x07 0x08 0x09 *	42	* 0x07 0x08 0x09 *
43	* 7 8 9 *	43	* 7 8 9 *
44	* */	44	* */
45	{ 0x6b8601, KEY_1 },	45	{ 0x866b01, KEY_1 },
46	{ 0x6b8602, KEY_2 },	46	{ 0x866b02, KEY_2 },
47	{ 0x6b8603, KEY_3 },	47	{ 0x866b03, KEY_3 },
48	{ 0x6b8604, KEY_4 },	48	{ 0x866b04, KEY_4 },
49	{ 0x6b8605, KEY_5 },	49	{ 0x866b05, KEY_5 },
50	{ 0x6b8606, KEY_6 },	50	{ 0x866b06, KEY_6 },
51	{ 0x6b8607, KEY_7 },	51	{ 0x866b07, KEY_7 },
52	{ 0x6b8608, KEY_8 },	52	{ 0x866b08, KEY_8 },
53	{ 0x6b8609, KEY_9 },	53	{ 0x866b09, KEY_9 },
54		54
55	/* 0x0a 0x00 0x17 *	55	/* 0x0a 0x00 0x17 *
56	* RECALL 0 MODE *	56	* RECALL 0 MODE *
57	* */	57	* */
58	{ 0x6b860a, KEY_AGAIN },	58	{ 0x866b0a, KEY_AGAIN },
59	{ 0x6b8600, KEY_0 },	59	{ 0x866b00, KEY_0 },
60	{ 0x6b8617, KEY_MODE },	60	{ 0x866b17, KEY_MODE },
61		61
62	/* 0x14 0x10 *	62	/* 0x14 0x10 *
63	* ASPECT FULLSCREEN *	63	* ASPECT FULLSCREEN *
64	* */	64	* */
65	{ 0x6b8614, KEY_SCREEN },	65	{ 0x866b14, KEY_SCREEN },
66	{ 0x6b8610, KEY_ZOOM },	66	{ 0x866b10, KEY_ZOOM },
67		67
68	/* 0x0b *	68	/* 0x0b *
69	* Up *	69	* Up *
@@ -74,17 +74,17 @@ static struct rc_map_table behold[] = {
74	* 0x015 *	74	* 0x015 *
75	* Down *	75	* Down *
76	* */	76	* */
77	{ 0x6b860b, KEY_CHANNELUP },	77	{ 0x866b0b, KEY_CHANNELUP },
78	{ 0x6b8618, KEY_VOLUMEDOWN },	78	{ 0x866b18, KEY_VOLUMEDOWN },
79	{ 0x6b8616, KEY_OK }, /* XXX KEY_ENTER */	79	{ 0x866b16, KEY_OK }, /* XXX KEY_ENTER */
80	{ 0x6b860c, KEY_VOLUMEUP },	80	{ 0x866b0c, KEY_VOLUMEUP },
81	{ 0x6b8615, KEY_CHANNELDOWN },	81	{ 0x866b15, KEY_CHANNELDOWN },
82		82
83	/* 0x11 0x0d *	83	/* 0x11 0x0d *
84	* MUTE INFO *	84	* MUTE INFO *
85	* */	85	* */
86	{ 0x6b8611, KEY_MUTE },	86	{ 0x866b11, KEY_MUTE },
87	{ 0x6b860d, KEY_INFO },	87	{ 0x866b0d, KEY_INFO },
88		88
89	/* 0x0f 0x1b 0x1a *	89	/* 0x0f 0x1b 0x1a *
90	* RECORD PLAY/PAUSE STOP *	90	* RECORD PLAY/PAUSE STOP *
@@ -93,26 +93,26 @@ static struct rc_map_table behold[] = {
93	TELETEXT AUDIO SOURCE	93	TELETEXT AUDIO SOURCE
94	* RED YELLOW *	94	* RED YELLOW *
95	* */	95	* */
96	{ 0x6b860f, KEY_RECORD },	96	{ 0x866b0f, KEY_RECORD },
97	{ 0x6b861b, KEY_PLAYPAUSE },	97	{ 0x866b1b, KEY_PLAYPAUSE },
98	{ 0x6b861a, KEY_STOP },	98	{ 0x866b1a, KEY_STOP },
99	{ 0x6b860e, KEY_TEXT },	99	{ 0x866b0e, KEY_TEXT },
100	{ 0x6b861f, KEY_RED }, /XXX KEY_AUDIO /	100	{ 0x866b1f, KEY_RED }, /XXX KEY_AUDIO /
101	{ 0x6b861e, KEY_VIDEO },	101	{ 0x866b1e, KEY_VIDEO },
102		102
103	/* 0x1d 0x13 0x19 *	103	/* 0x1d 0x13 0x19 *
104	* SLEEP PREVIEW DVB *	104	* SLEEP PREVIEW DVB *
105	* GREEN BLUE *	105	* GREEN BLUE *
106	* */	106	* */
107	{ 0x6b861d, KEY_SLEEP },	107	{ 0x866b1d, KEY_SLEEP },
108	{ 0x6b8613, KEY_GREEN },	108	{ 0x866b13, KEY_GREEN },
109	{ 0x6b8619, KEY_BLUE }, /* XXX KEY_SAT */	109	{ 0x866b19, KEY_BLUE }, /* XXX KEY_SAT */
110		110
111	/* 0x58 0x5c *	111	/* 0x58 0x5c *
112	* FREEZE SNAPSHOT *	112	* FREEZE SNAPSHOT *
113	* */	113	* */
114	{ 0x6b8658, KEY_SLOW },	114	{ 0x866b58, KEY_SLOW },
115	{ 0x6b865c, KEY_CAMERA },	115	{ 0x866b5c, KEY_CAMERA },
116		116
117	};	117	};
118		118