From 7855f95d58e677a6dd22e8ddb8324ea18ecbb4d2 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 12 Nov 2008 14:05:46 -0300
Subject: [PATCH] --- yaml --- r: 124191 b: refs/heads/master c:
 91812fa74f29f70a2c3a4bf58f7601f86092794f h: refs/heads/master i:   124189:
 c008cdcc21eb65f610e826c7e2ad5e2a52b3f11f   124187:
 9a8cc2584905281bf357ef6fa6e3c2bf0366d024   124183:
 76cf67a07ae05e883fccfa750fc1f44ec6a7e507   124175:
 de02b24cb9ed62b2e7ae52899190bc34df48c8e0   124159:
 f3ab620f97dcb258ab299c2d96a11f96ea0fe268 v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/media/video/em28xx/em28xx-input.c | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index ac3f3df7de16..1f63874b9700 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a924a499adb89f52046936deac87264774652a81
+refs/heads/master: 91812fa74f29f70a2c3a4bf58f7601f86092794f
diff --git a/trunk/drivers/media/video/em28xx/em28xx-input.c b/trunk/drivers/media/video/em28xx/em28xx-input.c
index afd67607c028..f724cae8b040 100644
--- a/trunk/drivers/media/video/em28xx/em28xx-input.c
+++ b/trunk/drivers/media/video/em28xx/em28xx-input.c
@@ -270,6 +270,11 @@ int em28xx_ir_init(struct em28xx *dev)
 
 	/* detect & configure */
 	switch (dev->model) {
+	case EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950:
+		ir_type          = IR_TYPE_OTHER;
+		ir_codes         = ir_codes_hauppauge_new;
+		ir->mask_keycode = 0x007f0000;
+		break;
 	}
 
 	if (NULL == ir_codes) {
@@ -277,10 +282,6 @@ int em28xx_ir_init(struct em28xx *dev)
 		goto err_out_free;
 	}
 
-	/* Get the current key status, to avoid adding an
-	   unexistent key code */
-	ir->last_gpio    = ir->get_key(ir);
-
 	/* init input device */
 	snprintf(ir->name, sizeof(ir->name), "em28xx IR (%s)",
 						dev->name);
@@ -301,6 +302,10 @@ int em28xx_ir_init(struct em28xx *dev)
 	ir->dev = dev;
 	dev->ir = ir;
 
+	/* Get the current key status, to avoid adding an
+	   unexistent key code */
+	ir->last_gpio    = ir->get_key(ir);
+
 	em28xx_ir_start(ir);
 
 	/* all done */