diff options
| author | Ricardo Cerqueira <devnull@localhost> | 2005-11-05 02:49:20 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <devnull@localhost> | 2005-11-05 02:49:20 +0000 |
| commit | 01bae253fab811e0e8938576d483a7773a97a7d1 (patch) | |
| tree | 8a2cc6e193880f075193a00c29924f40f50715d1 /linux/drivers/media/video/saa7134/saa7134-input.c | |
| parent | a94efc083924c335223beb5d03860b06714b0c98 (diff) | |
| download | mediapointer-dvb-s2-01bae253fab811e0e8938576d483a7773a97a7d1.tar.gz mediapointer-dvb-s2-01bae253fab811e0e8938576d483a7773a97a7d1.tar.bz2 | |
- SAA713x cards with i2c remotes now autoload ir-kbd-i2c
(disable_ir works, as it does for GPIO remotes)
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-input.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-input.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-input.c b/linux/drivers/media/video/saa7134/saa7134-input.c index c2d214eb2..cacb8eb73 100644 --- a/linux/drivers/media/video/saa7134/saa7134-input.c +++ b/linux/drivers/media/video/saa7134/saa7134-input.c @@ -1,5 +1,5 @@ /* - * $Id: saa7134-input.c,v 1.38 2005/11/03 20:00:36 nsh Exp $ + * $Id: saa7134-input.c,v 1.39 2005/11/05 02:49:20 rmcc Exp $ * * handle saa7134 IR remotes via linux kernel input layer. * @@ -728,7 +728,7 @@ int saa7134_input_init1(struct saa7134_dev *dev) int polling = 0; int ir_type = IR_TYPE_OTHER; - if (!dev->has_remote) + if (dev->has_remote != SAA7134_REMOTE_GPIO) return -ENODEV; if (disable_ir) return -ENODEV; @@ -889,6 +889,7 @@ void saa7134_input_fini(struct saa7134_dev *dev) void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir) { if (disable_ir) { + dprintk("Found supported i2c remote, but IR has been disabled\n"); ir->get_key=NULL; return; } |