From patchwork Fri Nov 26 13:12:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hogan X-Patchwork-Id: 358562 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAQDDAph001377 for ; Fri, 26 Nov 2010 13:13:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754024Ab0KZNMr (ORCPT ); Fri, 26 Nov 2010 08:12:47 -0500 Received: from mail-qy0-f181.google.com ([209.85.216.181]:47697 "EHLO mail-qy0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750866Ab0KZNMq (ORCPT ); Fri, 26 Nov 2010 08:12:46 -0500 Received: by qyk12 with SMTP id 12so3382621qyk.19 for ; Fri, 26 Nov 2010 05:12:46 -0800 (PST) MIME-Version: 1.0 Received: by 10.224.191.196 with SMTP id dn4mr1943488qab.225.1290777165804; Fri, 26 Nov 2010 05:12:45 -0800 (PST) Received: by 10.220.188.202 with HTTP; Fri, 26 Nov 2010 05:12:45 -0800 (PST) X-Originating-IP: [87.194.181.195] Date: Fri, 26 Nov 2010 13:12:45 +0000 Message-ID: Subject: [PATCH] ir-nec-decoder: fix extended NEC scancodes From: James Hogan To: Mauro Carvalho Chehab , =?ISO-8859-1?Q?David_H=E4rdeman?= , Jarod Wilson , Maxim Levitsky , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 26 Nov 2010 13:13:10 +0000 (UTC) diff --git a/drivers/media/IR/ir-nec-decoder.c b/drivers/media/IR/ir-nec-decoder.c index 70993f7..11d3e78 100644 --- a/drivers/media/IR/ir-nec-decoder.c +++ b/drivers/media/IR/ir-nec-decoder.c @@ -166,8 +166,8 @@ static int ir_nec_decode(struct input_dev *input_dev, struct ir_raw_event ev) if ((address ^ not_address) != 0xff) { /* Extended NEC */ - scancode = address << 16 | - not_address << 8 | + scancode = not_address << 16 | + address << 8 | command; IR_dprintk(1, "NEC (Ext) scancode 0x%06x\n", scancode);