Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b677b885 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Chris Ball
Browse files

mmc: rtsx: fix possible linking error if built-in 



rtsx_usb_sdmmc module uses the LED classdev if available, but the code
failed to consider the situation that it is built-in and the LED classdev is a
module, leading to following linking error:

   LD      init/built-in.o
drivers/built-in.o: In function `rtsx_usb_sdmmc_drv_remove':
rtsx_usb_sdmmc.c:(.text+0x2a018e): undefined reference to
`led_classdev_unregister'
drivers/built-in.o: In function `rtsx_usb_sdmmc_drv_probe':
rtsx_usb_sdmmc.c:(.text+0x2a197e): undefined reference to
`led_classdev_register'

Fix by excluding such condition when defining macro RTSX_USB_USE_LEDS_CLASS.

Signed-off-by: default avatarRoger Tseng <rogerable@realtek.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarChris Ball <chris@printf.net>
parent 91769986

drivers/mmc/host/rtsx_usb_sdmmc.c

+3 −2
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ 
#include <linux/mfd/rtsx_usb.h>

#include <asm/unaligned.h>



#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)

#if defined(CONFIG_LEDS_CLASS) || (defined(CONFIG_LEDS_CLASS_MODULE) && \

		defined(CONFIG_MMC_REALTEK_USB_MODULE))

#include <linux/leds.h>

#include <linux/workqueue.h>

#define RTSX_USB_USE_LEDS_CLASS
@@ -59,7 +60,7 @@ struct rtsx_usb_sdmmc { 


	unsigned char		power_mode;



#if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE)

#ifdef RTSX_USB_USE_LEDS_CLASS

	struct led_classdev	led;

	char			led_name[32];

	struct work_struct	led_work;