From 9b4656ad8a4d0aa716632d87328809a482bb21df Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 30 Dec 2010 11:58:37 -0300 Subject: [PATCH] --- yaml --- r: 226409 b: refs/heads/master c: 9804ed9e840c461f88b290dea43173e3eed37102 h: refs/heads/master i: 226407: 6c749d42e98ad5b8f78765471600ec1c2688b1d5 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-i2c.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3f8fc5bfeeb7..a7ae4483e2b0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abfd013b665d21f57bc4b2e455b23c4cece0df9f +refs/heads/master: 9804ed9e840c461f88b290dea43173e3eed37102 diff --git a/trunk/drivers/media/video/ivtv/ivtv-i2c.c b/trunk/drivers/media/video/ivtv/ivtv-i2c.c index 2bed4309c16b..e103b8fc7452 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-i2c.c +++ b/trunk/drivers/media/video/ivtv/ivtv-i2c.c @@ -167,8 +167,8 @@ static int get_key_adaptec(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw) keybuf[2] &= 0x7f; keybuf[3] |= 0x80; - *ir_key = (u32) keybuf; - *ir_raw = (u32) keybuf; + *ir_key = keybuf[3] | keybuf[2] << 8 | keybuf[1] << 16 |keybuf[0] << 24; + *ir_raw = *ir_key; return 1; }