diff options
| author | Jarod Wilson <jarod@redhat.com> | 2010-10-23 21:43:29 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-23 21:49:09 +0200 |
| commit | 52fae5eead706cb8d604ee634162f6694d75ccad (patch) | |
| tree | e247c78928efdd3cf9637e9dc8a266cb127ce874 /drivers/media | |
| parent | [media] imon: remove redundant change_protocol call (diff) | |
| download | linux-52fae5eead706cb8d604ee634162f6694d75ccad.tar.xz linux-52fae5eead706cb8d604ee634162f6694d75ccad.zip | |
[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.c | 4 |
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) 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"); |