aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2010-10-23 19:43:29 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-23 19:49:09 (GMT)
commit52fae5eead706cb8d604ee634162f6694d75ccad (patch)
treee247c78928efdd3cf9637e9dc8a266cb127ce874
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>
-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 b4d489d..f782a9d 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)
case IR_TYPE_UNKNOWN:
case IR_TYPE_OTHER:
dev_dbg(dev, "Configuring IR receiver for iMON protocol\n");
- if (pad_stabilize)
+ if (pad_stabilize && !nomouse)
pad_mouse = true;
else {
dev_dbg(dev, "PAD stabilize functionality disabled\n");
@@ -1016,7 +1016,7 @@ int imon_ir_change_protocol(void *priv, u64 ir_type)
default:
dev_warn(dev, "Unsupported IR protocol specified, overriding "
"to iMON IR protocol\n");
- if (pad_stabilize)
+ if (pad_stabilize && !nomouse)
pad_mouse = true;
else {
dev_dbg(dev, "PAD stabilize functionality disabled\n");

Privacy Policy