aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-input.c
diff options
context:
space:
mode:
authorRicardo Cerqueira <v4l@cerqueira.org>2005-11-09 00:38:47 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:30 -0500
commitcb2444dfa203b5b5c76d63c0ce8593e4e0385719 (patch)
treeee62805570a23eb9d44acfafe01b6657f2cc38d1 /drivers/media/video/saa7134/saa7134-input.c
parentf1bcef8874ab33b1e517b79a9b9df7309a996877 (diff)
[PATCH] V4L: 913: saa713x cards with i2c remotes now autoload ir-kbd-i2c
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> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-input.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 2aba72de55d6..b792401712ba 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -716,7 +716,7 @@ int saa7134_input_init1(struct saa7134_dev *dev)
716 int polling = 0; 716 int polling = 0;
717 int ir_type = IR_TYPE_OTHER; 717 int ir_type = IR_TYPE_OTHER;
718 718
719 if (!dev->has_remote) 719 if (dev->has_remote != SAA7134_REMOTE_GPIO)
720 return -ENODEV; 720 return -ENODEV;
721 if (disable_ir) 721 if (disable_ir)
722 return -ENODEV; 722 return -ENODEV;
@@ -877,6 +877,7 @@ void saa7134_input_fini(struct saa7134_dev *dev)
877void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir) 877void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir)
878{ 878{
879 if (disable_ir) { 879 if (disable_ir) {
880 dprintk("Found supported i2c remote, but IR has been disabled\n");
880 ir->get_key=NULL; 881 ir->get_key=NULL;
881 return; 882 return;
882 } 883 }