summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx/em28xx-input.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-input.c')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-input.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-input.c b/linux/drivers/media/video/em28xx/em28xx-input.c
index 4d3669f79..2780f683d 100644
--- a/linux/drivers/media/video/em28xx/em28xx-input.c
+++ b/linux/drivers/media/video/em28xx/em28xx-input.c
@@ -1,5 +1,5 @@
/*
- * $Id: em28xx-input.c,v 1.5 2005/10/16 12:13:58 mchehab Exp $
+ * $Id: em28xx-input.c,v 1.6 2005/10/18 14:16:40 mchehab Exp $
*
* handle saa7134 IR remotes via linux kernel input layer.
*
@@ -143,8 +143,10 @@ static int get_key_em_haup(struct IR_i2c *ir, u32 *ir_key, u32 *ir_raw)
/* ----------------------------------------------------------------------- */
void em2820_set_ir(struct em2820 * dev,struct IR_i2c *ir)
{
- if (disable_ir)
+ if (disable_ir) {
+ ir->get_key=NULL;
return ;
+ }
/* detect & configure */
switch (dev->model) {