From 6ba93290003f17fa23d29c09f3c11fc45d4d4985 Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Wed, 28 Apr 2010 14:37:29 -0300 Subject: [PATCH] --- yaml --- r: 193080 b: refs/heads/master c: 666a9ed8971657ea7dcf0bd9df17195db4dddf29 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/IR/imon.c | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 99fe59ddfa68..0307a621e482 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 96c1f99621a73c58f97d7ca615b2fe936abda555 +refs/heads/master: 666a9ed8971657ea7dcf0bd9df17195db4dddf29 diff --git a/trunk/drivers/media/IR/imon.c b/trunk/drivers/media/IR/imon.c index b65c31ab4a4f..f5fb08fba637 100644 --- a/trunk/drivers/media/IR/imon.c +++ b/trunk/drivers/media/IR/imon.c @@ -999,7 +999,7 @@ int imon_ir_change_protocol(void *priv, u64 ir_type) unsigned char ir_proto_packet[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86 }; - if (!(ir_type & ictx->props->allowed_protos)) + if (ir_type && !(ir_type & ictx->props->allowed_protos)) dev_warn(dev, "Looks like you're trying to use an IR protocol " "this device does not support\n"); @@ -1014,12 +1014,11 @@ int imon_ir_change_protocol(void *priv, u64 ir_type) break; case IR_TYPE_UNKNOWN: case IR_TYPE_OTHER: - dev_dbg(dev, "Configuring IR receiver for iMON protocol"); - if (pad_stabilize) { - printk(KERN_CONT "\n"); + dev_dbg(dev, "Configuring IR receiver for iMON protocol\n"); + if (pad_stabilize) pad_mouse = true; - } else { - printk(KERN_CONT " (without PAD stabilization)\n"); + else { + dev_dbg(dev, "PAD stabilize functionality disabled\n"); pad_mouse = false; } /* ir_proto_packet[0] = 0x00; // already the default */ @@ -1027,12 +1026,11 @@ int imon_ir_change_protocol(void *priv, u64 ir_type) break; default: dev_warn(dev, "Unsupported IR protocol specified, overriding " - "to iMON IR protocol"); - if (pad_stabilize) { - printk(KERN_CONT "\n"); + "to iMON IR protocol\n"); + if (pad_stabilize) pad_mouse = true; - } else { - printk(KERN_CONT " (without PAD stabilization)\n"); + else { + dev_dbg(dev, "PAD stabilize functionality disabled\n"); pad_mouse = false; } /* ir_proto_packet[0] = 0x00; // already the default */