lkml.org 
[lkml]   [2016]   [Feb]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 03/87] [media] rc: allow rc modules to be loaded if rc-main is not a module
    3.2.77-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Russell King <rmk+kernel@arm.linux.org.uk>

    commit 2ff56fadd94cdaeeaeccbc0a9b703a0101ada128 upstream.

    rc-main mistakenly uses #ifdef MODULE to determine whether it should
    load the rc keymap modules. This symbol is only defined if rc-main
    is being built as a module itself, and bears no relation to whether
    the rc keymaps are modules.

    Fix this to use CONFIG_MODULES instead.

    Fixes: 631493ecacd8 ("[media] rc-core: merge rc-map.c into rc-main.c")

    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/media/rc/rc-main.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/media/rc/rc-main.c
    +++ b/drivers/media/rc/rc-main.c
    @@ -54,7 +54,7 @@ struct rc_map *rc_map_get(const char *na
    struct rc_map_list *map;

    map = seek_rc_map(name);
    -#ifdef MODULE
    +#ifdef CONFIG_MODULES
    if (!map) {
    int rc = request_module(name);
    if (rc < 0) {
    \
     
     \ /
      Last update: 2016-02-09 01:41    [W:3.566 / U:0.524 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site