aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2010-10-23 15:43:29 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-23 15:49:09 -0400
commit52fae5eead706cb8d604ee634162f6694d75ccad (patch)
treee247c78928efdd3cf9637e9dc8a266cb127ce874 /drivers/media
parent6aa209e41fd51d3ade96e1550d9b514a07ebd8f1 (diff)
[media] imon: fix nomouse modprobe option
Pointed out by Bonne Eggleston on the lirc list. Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/IR/imon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/IR/imon.c b/drivers/media/IR/imon.c
index b4d489deadc3..f782a9d72ce6 100644
--- a/drivers/media/IR/imon.c
+++ b/drivers/media/IR/imon.c
@@ -1004,7 +1004,7 @@ int imon_ir_change_protocol(void *priv, u64 ir_type)
1004 case IR_TYPE_UNKNOWN: 1004 case IR_TYPE_UNKNOWN:
1005 case IR_TYPE_OTHER: 1005 case IR_TYPE_OTHER:
1006 dev_dbg(dev, "Configuring IR receiver for iMON protocol\n"); 1006 dev_dbg(dev, "Configuring IR receiver for iMON protocol\n");
1007 if (pad_stabilize) 1007 if (pad_stabilize && !nomouse)
1008 pad_mouse = true; 1008 pad_mouse = true;
1009 else { 1009 else {
1010 dev_dbg(dev, "PAD stabilize functionality disabled\n"); 1010 dev_dbg(dev, "PAD stabilize functionality disabled\n");
@@ -1016,7 +1016,7 @@ int imon_ir_change_protocol(void *priv, u64 ir_type)
1016 default: 1016 default:
1017 dev_warn(dev, "Unsupported IR protocol specified, overriding " 1017 dev_warn(dev, "Unsupported IR protocol specified, overriding "
1018 "to iMON IR protocol\n"); 1018 "to iMON IR protocol\n");
1019 if (pad_stabilize) 1019 if (pad_stabilize && !nomouse)
1020 pad_mouse = true; 1020 pad_mouse = true;
1021 else { 1021 else {
1022 dev_dbg(dev, "PAD stabilize functionality disabled\n"); 1022 dev_dbg(dev, "PAD stabilize functionality disabled\n");