Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a18a80b0 authored by Thorsten Maerz's avatar Thorsten Maerz Committed by Linus Torvalds
Browse files

[PATCH] dvb: remove duplicate key definitions 



The duplicate key definitions cause misinterpretations with other keys, e.g.
the "TELETEXT" key clashes with "CHANNEL_UP" and thus can not be used with
LIRC.  This patch removes these duplicates.

Signed-off-by: default avatarThorsten Maerz <torte@netztorte.de>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Cc: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6573dd75

drivers/media/dvb/dvb-usb/a800.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -43,11 +43,9 @@ static struct dvb_usb_rc_key a800_rc_keys[] = { 
	{ 0x02, 0x13, KEY_RIGHT },       /* R / CH RTN */

	{ 0x02, 0x13, KEY_RIGHT },       /* R / CH RTN */

	{ 0x02, 0x17, KEY_PROG2 },       /* SNAP SHOT */

	{ 0x02, 0x17, KEY_PROG2 },       /* SNAP SHOT */

	{ 0x02, 0x10, KEY_PROG3 },       /* 16-CH PREV */

	{ 0x02, 0x10, KEY_PROG3 },       /* 16-CH PREV */

	{ 0x02, 0x03, KEY_CHANNELUP },   /* CH UP */

	{ 0x02, 0x1e, KEY_VOLUMEDOWN },  /* VOL DOWN */

	{ 0x02, 0x1e, KEY_VOLUMEDOWN },  /* VOL DOWN */

	{ 0x02, 0x0c, KEY_ZOOM },        /* FULL SCREEN */

	{ 0x02, 0x0c, KEY_ZOOM },        /* FULL SCREEN */

	{ 0x02, 0x1f, KEY_VOLUMEUP },    /* VOL UP */

	{ 0x02, 0x1f, KEY_VOLUMEUP },    /* VOL UP */

	{ 0x02, 0x02, KEY_CHANNELDOWN }, /* CH DOWN */

	{ 0x02, 0x14, KEY_MUTE },        /* MUTE */

	{ 0x02, 0x14, KEY_MUTE },        /* MUTE */

	{ 0x02, 0x08, KEY_AUDIO },       /* AUDIO */

	{ 0x02, 0x08, KEY_AUDIO },       /* AUDIO */

	{ 0x02, 0x19, KEY_RECORD },      /* RECORD */

	{ 0x02, 0x19, KEY_RECORD },      /* RECORD */
@@ -57,8 +55,6 @@ static struct dvb_usb_rc_key a800_rc_keys[] = { 
	{ 0x02, 0x1d, KEY_BACK },        /* << / RED */

	{ 0x02, 0x1d, KEY_BACK },        /* << / RED */

	{ 0x02, 0x1c, KEY_FORWARD },     /* >> / YELLOW */

	{ 0x02, 0x1c, KEY_FORWARD },     /* >> / YELLOW */

	{ 0x02, 0x03, KEY_TEXT },        /* TELETEXT */

	{ 0x02, 0x03, KEY_TEXT },        /* TELETEXT */

	{ 0x02, 0x01, KEY_FIRST },       /* |<< / GREEN */

	{ 0x02, 0x00, KEY_LAST },        /* >>| / BLUE */

	{ 0x02, 0x04, KEY_EPG },         /* EPG */

	{ 0x02, 0x04, KEY_EPG },         /* EPG */

	{ 0x02, 0x15, KEY_MENU },        /* MENU */

	{ 0x02, 0x15, KEY_MENU },        /* MENU */