diff options
| author | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-18 14:16:40 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <devnull@localhost> | 2005-10-18 14:16:40 +0000 |
| commit | 16a273f4ec7f5c656bd5d7a6c1a5947382b1e4b4 (patch) | |
| tree | 19a16c1a2c3caf44753241a26521e84264031128 /linux/drivers/media/video/em28xx/em28xx-input.c | |
| parent | 3720545470a7da73312e489eb96c34ce2a30d6de (diff) | |
| download | mediapointer-dvb-s2-16a273f4ec7f5c656bd5d7a6c1a5947382b1e4b4.tar.gz mediapointer-dvb-s2-16a273f4ec7f5c656bd5d7a6c1a5947382b1e4b4.tar.bz2 | |
- 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 <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-input.c')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-input.c | 6 |
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) { |