lkml.org 
[lkml]   [2019]   [May]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.1 050/122] media: seco-cec: fix building with RC_CORE=m
    Date
    From: Arnd Bergmann <arnd@arndb.de>

    commit 63604a143fe168094fbbccba56f6e3241683e399 upstream.

    I previously added an RC_CORE dependency here, but missed the corner
    case of CONFIG_VIDEO_SECO_CEC=y with CONFIG_RC_CORE=m, which still
    causes a link error:

    drivers/media/platform/seco-cec/seco-cec.o: In function `secocec_probe':
    seco-cec.c:(.text+0x1b8): undefined reference to `devm_rc_allocate_device'
    seco-cec.c:(.text+0x2e8): undefined reference to `devm_rc_register_device'
    drivers/media/platform/seco-cec/seco-cec.o: In function `secocec_irq_handler':
    seco-cec.c:(.text+0xa2c): undefined reference to `rc_keydown'

    Refine the dependency to disallow building the RC subdriver in this case.
    This is the same logic we apply in other drivers like it.

    Fixes: f27dd0ad6885 ("media: seco-cec: fix RC_CORE dependency")

    Cc: <stable@vger.kernel.org> # 5.1
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Sean Young <sean@mess.org>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/media/platform/Kconfig | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/media/platform/Kconfig
    +++ b/drivers/media/platform/Kconfig
    @@ -649,7 +649,7 @@ config VIDEO_SECO_CEC
    config VIDEO_SECO_RC
    bool "SECO Boards IR RC5 support"
    depends on VIDEO_SECO_CEC
    - depends on RC_CORE
    + depends on RC_CORE=y || RC_CORE = VIDEO_SECO_CEC
    help
    If you say yes here you will get support for the
    SECO Boards Consumer-IR in seco-cec driver.

    \
     
     \ /
      Last update: 2019-05-23 21:39    [W:4.284 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site