From patchwork Wed Mar 16 20:24:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarod Wilson X-Patchwork-Id: 6126 Return-path: Envelope-to: mchehab@pedra Delivery-date: Wed, 16 Mar 2011 19:12:28 -0300 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1Pzyx8-0000YL-O6 for mchehab@pedra; Wed, 16 Mar 2011 19:12:27 -0300 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Wed, 16 Mar 2011 19:12:26 -0300 (BRT) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1PzxGt-0005fJ-HY; Wed, 16 Mar 2011 20:24:43 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754034Ab1CPUYk (ORCPT + 1 other); Wed, 16 Mar 2011 16:24:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39810 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753569Ab1CPUYi (ORCPT ); Wed, 16 Mar 2011 16:24:38 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p2GKOcJ9000987 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 16 Mar 2011 16:24:38 -0400 Received: from xavier.bos.redhat.com (xavier.bos.redhat.com [10.16.16.50]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p2GKOXHi024620; Wed, 16 Mar 2011 16:24:37 -0400 From: Jarod Wilson To: linux-media@vger.kernel.org Cc: Jarod Wilson Subject: [PATCH 3/6] ir-kbd-i2c: pass device code w/key in hauppauge case Date: Wed, 16 Mar 2011 16:24:28 -0400 Message-Id: <1300307071-19665-4-git-send-email-jarod@redhat.com> In-Reply-To: <1300307071-19665-1-git-send-email-jarod@redhat.com> References: <1300307071-19665-1-git-send-email-jarod@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: The new hauppauge key tables use both device code button code. Signed-off-by: Jarod Wilson --- drivers/media/video/ir-kbd-i2c.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index 672935f..3ab875d 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c @@ -108,7 +108,7 @@ static int get_key_haup_common(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw, start, range, toggle, dev, code); /* return key */ - *ir_key = code; + *ir_key = (dev << 8) | code; *ir_raw = ircode; return 1; }