Commit dd6ff6a0 authored by David Härdeman's avatar David Härdeman Committed by Mauro Carvalho Chehab

[media] rc-core: improve the lirc protocol reporting

Commit 275ddb40 removed the lirc
"protocol" but kept backwards compatibility by always listing
the protocol as present and enabled. This patch further improves
the logic by only listing the protocol if the lirc module is loaded
(or if lirc is builtin).
Signed-off-by: default avatarDavid Härdeman <david@hardeman.nu>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent f103a9c1
...@@ -828,6 +828,23 @@ struct rc_filter_attribute { ...@@ -828,6 +828,23 @@ struct rc_filter_attribute {
.mask = (_mask), \ .mask = (_mask), \
} }
static bool lirc_is_present(void)
{
#if defined(CONFIG_LIRC_MODULE)
struct module *lirc;
mutex_lock(&module_mutex);
lirc = find_module("lirc_dev");
mutex_unlock(&module_mutex);
return lirc ? true : false;
#elif defined(CONFIG_LIRC)
return true;
#else
return false;
#endif
}
/** /**
* show_protocols() - shows the current/wakeup IR protocol(s) * show_protocols() - shows the current/wakeup IR protocol(s)
* @device: the device descriptor * @device: the device descriptor
...@@ -884,7 +901,7 @@ static ssize_t show_protocols(struct device *device, ...@@ -884,7 +901,7 @@ static ssize_t show_protocols(struct device *device,
allowed &= ~proto_names[i].type; allowed &= ~proto_names[i].type;
} }
if (dev->driver_type == RC_DRIVER_IR_RAW) if (dev->driver_type == RC_DRIVER_IR_RAW && lirc_is_present())
tmp += sprintf(tmp, "[lirc] "); tmp += sprintf(tmp, "[lirc] ");
if (tmp != buf) if (tmp != buf)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment