From patchwork Fri May 6 00:11:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 6525 Return-path: Envelope-to: mchehab@pedra Delivery-date: Thu, 05 May 2011 21:16:09 -0300 Received: from mchehab by pedra with local (Exim 4.72) (envelope-from ) id 1QI8iG-0006bi-UM for mchehab@pedra; Thu, 05 May 2011 21:16:09 -0300 Received: from casper.infradead.org [85.118.1.10] by pedra with IMAP (fetchmail-6.3.17) for (single-drop); Thu, 05 May 2011 21:16:08 -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 1QI8he-0004R5-Cs; Fri, 06 May 2011 00:15:30 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755094Ab1EFAOj (ORCPT + 1 other); Thu, 5 May 2011 20:14:39 -0400 Received: from kroah.org ([198.145.64.141]:32976 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754967Ab1EFANm (ORCPT ); Thu, 5 May 2011 20:13:42 -0400 Received: from localhost (c-76-121-69-168.hsd1.wa.comcast.net [76.121.69.168]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by coco.kroah.org (Postfix) with ESMTPSA id C23D848923; Thu, 5 May 2011 17:13:41 -0700 (PDT) X-Mailbox-Line: From gregkh@clark.kroah.org Thu May 5 17:12:10 2011 Message-Id: <20110506001210.810495759@clark.kroah.org> User-Agent: quilt/0.48-16.4 Date: Thu, 05 May 2011 17:11:08 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org, Greg KH Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Jarod Wilson , Lawrence Rust , Linux Media Mailing List , Lawrence Rust , Mauro Carvalho Chehab Subject: [patch 36/38] [media] cx88: Fix HVR4000 IR keymap In-Reply-To: <20110506001225.GA10547@kroah.com> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: 2.6.38-stable review patch. If anyone has any objections, please let us know. ------------------ From: Lawrence Rust [fixed in .39 in a much different way that is too big to backport to .38 - gregkh] Fixes the RC key input for Nova-S plus, HVR1100, HVR3000 and HVR4000 in the 2.6.38 kernel. Signed-off-by: Lawrence Rust Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/cx88/cx88-input.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c @@ -283,7 +283,7 @@ int cx88_ir_init(struct cx88_core *core, case CX88_BOARD_PCHDTV_HD3000: case CX88_BOARD_PCHDTV_HD5500: case CX88_BOARD_HAUPPAUGE_IRONLY: - ir_codes = RC_MAP_HAUPPAUGE_NEW; + ir_codes = RC_MAP_RC5_HAUPPAUGE_NEW; ir->sampling = 1; break; case CX88_BOARD_WINFAST_DTV2000H: