From 16a273f4ec7f5c656bd5d7a6c1a5947382b1e4b4 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 18 Oct 2005 14:16:40 +0000 Subject: - SAA713x keymaps and key builders were moved from ir-kbd-i2c.c to saa7134-input.c - saa7134-i2c's attach now detects I2C IR and calls saa7134 specific code. - Small bugfix at ir-kbd-i2c. - disable_ir now unregisters i2c device. Signed-off-by: Ricardo Cerqueira Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/em28xx/em28xx-input.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'linux/drivers/media/video/em28xx/em28xx-input.c') 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) { -- cgit v1.2.3