From b0ad28b0be75ff59e913f4541cf383bbd38b70ed Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Sat, 23 Oct 2010 16:43:29 -0300 Subject: [PATCH] --- yaml --- r: 219536 b: refs/heads/master c: 52fae5eead706cb8d604ee634162f6694d75ccad h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/IR/imon.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 356c27d55a43..060b1a400bdd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6aa209e41fd51d3ade96e1550d9b514a07ebd8f1 +refs/heads/master: 52fae5eead706cb8d604ee634162f6694d75ccad diff --git a/trunk/drivers/media/IR/imon.c b/trunk/drivers/media/IR/imon.c index b4d489deadc3..f782a9d72ce6 100644 --- a/trunk/drivers/media/IR/imon.c +++ b/trunk/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");