瀏覽代碼

[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>
Jarod Wilson 15 年之前
父節點
當前提交
52fae5eead
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/media/IR/imon.c

+ 2 - 2
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_UNKNOWN:
 	case IR_TYPE_OTHER:
 	case IR_TYPE_OTHER:
 		dev_dbg(dev, "Configuring IR receiver for iMON protocol\n");
 		dev_dbg(dev, "Configuring IR receiver for iMON protocol\n");
-		if (pad_stabilize)
+		if (pad_stabilize && !nomouse)
 			pad_mouse = true;
 			pad_mouse = true;
 		else {
 		else {
 			dev_dbg(dev, "PAD stabilize functionality disabled\n");
 			dev_dbg(dev, "PAD stabilize functionality disabled\n");
@@ -1016,7 +1016,7 @@ int imon_ir_change_protocol(void *priv, u64 ir_type)
 	default:
 	default:
 		dev_warn(dev, "Unsupported IR protocol specified, overriding "
 		dev_warn(dev, "Unsupported IR protocol specified, overriding "
 			 "to iMON IR protocol\n");
 			 "to iMON IR protocol\n");
-		if (pad_stabilize)
+		if (pad_stabilize && !nomouse)
 			pad_mouse = true;
 			pad_mouse = true;
 		else {
 		else {
 			dev_dbg(dev, "PAD stabilize functionality disabled\n");
 			dev_dbg(dev, "PAD stabilize functionality disabled\n");