From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 5 May 2011 21:08:38 +0000 (-0700)
Subject: .38 patches
X-Git-Tag: v2.6.38.6~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c54931a21941ba649d5a836bd86811adba61b813;p=thirdparty%2Fkernel%2Fstable-queue.git

.38 patches
---

diff --git a/queue-2.6.38/cx88-fix-hvr4000-ir-keymap.patch b/queue-2.6.38/cx88-fix-hvr4000-ir-keymap.patch
new file mode 100644
index 00000000000..f66d79c06ce
--- /dev/null
+++ b/queue-2.6.38/cx88-fix-hvr4000-ir-keymap.patch
@@ -0,0 +1,35 @@
+From mchehab@redhat.com  Thu May  5 13:34:25 2011
+From: Lawrence Rust <lvr@softsystem.dot.uk>
+Date: Wed, 04 May 2011 23:25:10 -0300
+Subject: [media] cx88: Fix HVR4000 IR keymap
+To: Greg KH <greg@kroah.com>
+Cc: Jarod Wilson <jarod@wilsonet.com>, Lawrence Rust <lawrence@softsystem.co.uk>, Linux Media Mailing List <linux-media@vger.kernel.org>
+Message-ID: <4DC20A86.7010509@redhat.com>
+
+From: Lawrence Rust <lvr@softsystem.dot.uk>
+
+[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 <lvr@softsystem.dot.uk>
+Acked-by: Jarod Wilson <jarod@wilsonet.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+
+---
+ drivers/media/video/cx88/cx88-input.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- 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:
diff --git a/queue-2.6.38/series b/queue-2.6.38/series
index a9e0c9731ca..572440ad8e7 100644
--- a/queue-2.6.38/series
+++ b/queue-2.6.38/series
@@ -33,3 +33,4 @@ xz-decompressor-fix-decoding-of-empty-lzma2-streams.patch
 open-with-o_creat-flag-set-fails-to-open-existing-files-on-non-writable-directories.patch
 can-add-missing-socket-check-in-can-bcm-release.patch
 fs-partitions-ldm.c-fix-oops-caused-by-corrupted-partition-table.patch
+cx88-fix-hvr4000-ir-keymap.patch