summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJarod Wilson <jarod@redhat.com>2010-04-28 14:37:29 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 12:58:26 -0300
commit666a9ed8971657ea7dcf0bd9df17195db4dddf29 (patch)
tree4c69fc95f27a421afec6434df75152999421704c /drivers
parent96c1f99621a73c58f97d7ca615b2fe936abda555 (diff)
V4L/DVB: IR/imon: minor change_protocol fixups
This is a follow-up to my prior patch implementing ir-core's change_protocol functionality in the imon driver, which eliminates a false warning when change_protocol is called without a specific protocol selected yet (i.e., still IR_TYPE_UNKNOWN). It also removes some extraneous blank lines getting spewn into dmesg. Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/IR/imon.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/media/IR/imon.c b/drivers/media/IR/imon.c
index b65c31ab4a4f..f5fb08fba637 100644
--- a/drivers/media/IR/imon.c
+++ b/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 */