Commit 083e4721 authored May 04, 2010 by Jarod Wilson Committed by Mauro Carvalho Chehab May 19, 2010

V4L/DVB: IR/imon: remove dead IMON_KEY_RELEASE_OFFSET

On Tue, May 04, 2010 at 06:06:41PM +0200, Dan Carpenter wrote:
> On Tue, May 04, 2010 at 10:03:18AM -0400, Jarod Wilson wrote:
> > @@ -1205,7 +1204,7 @@ static u32 imon_panel_key_lookup(u64 hw_code)
> >  		if (imon_panel_key_table[i].hw_code == (code | 0xffee))
> >  			break;
> >
> > -	keycode = imon_panel_key_table[i % IMON_KEY_RELEASE_OFFSET].keycode;
> > +	keycode = imon_panel_key_table[i].keycode;
> >
> >  	return keycode;
> >  }
>
> There is still potentially a problem here because if we don't hit the
> break statement, then we're one past the end of the array.

D'oh. Okay, here's v2, should fix that buglet too.

This hack was used when the imon driver was using internal key lookup
routines, but became dead weight when the driver was converted to use
ir-core's key lookup routines. These bits simply didn't get removed,
drop 'em now.

Pointed out by Dan Carpenter.

v2: fix possible attempt to access beyond end of key table array,
also pointed out by Dan.

Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 9986da29

drivers/media/IR/imon.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -55,7 +55,6 @@
		#define BIT_DURATION 250 /* each bit received is 250us */

		#define IMON_CLOCK_ENABLE_PACKETS 2
		#define IMON_KEY_RELEASE_OFFSET 1000

		/* P R O T O T Y P E S */

		@@ -1199,13 +1198,14 @@ static u32 imon_panel_key_lookup(u64 hw_code)
		{
		int i;
		u64 code = be64_to_cpu(hw_code);
		u32 keycode;
		u32 keycode = KEY_RESERVED;

		for (i = 0; i < ARRAY_SIZE(imon_panel_key_table); i++)
		if (imon_panel_key_table[i].hw_code == (code \| 0xffee))
		for (i = 0; i < ARRAY_SIZE(imon_panel_key_table); i++) {
		if (imon_panel_key_table[i].hw_code == (code \| 0xffee)) {
		keycode = imon_panel_key_table[i].keycode;
		break;

		keycode = imon_panel_key_table[i % IMON_KEY_RELEASE_OFFSET].keycode;
		}
		}

		return keycode;
		}

Admin message