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

Commit a4bb6f35 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Mauro Carvalho Chehab
Browse files

[media] media/rc: fix oops on unloading module rc-core 



During modiles initialization rc-core schedules work which calls
request_module() several times to load ir-*-decoder modules, but
it does not wait or cancel this work on module unloading.
rc-core should use request_module_nowait() instead, because it
anyway cannot load modules synchronously or cancel/wait pending
work on unloading, because this leads to deadlock on modules_mutex
between several "modprobe" processes.

Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@openvz.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent f7c3f5ce

drivers/media/rc/ir-raw.c

+1 −16
Original line number Diff line number Diff line
@@ -31,11 +31,6 @@ static DEFINE_MUTEX(ir_raw_handler_lock); 
static LIST_HEAD(ir_raw_handler_list);

static u64 available_protocols;



#ifdef MODULE

/* Used to load the decoders */

static struct work_struct wq_load;

#endif



static int ir_raw_event_thread(void *data)

{

	struct ir_raw_event ev;
@@ -347,8 +342,7 @@ void ir_raw_handler_unregister(struct ir_raw_handler *ir_raw_handler) 
}

EXPORT_SYMBOL(ir_raw_handler_unregister);



#ifdef MODULE

static void init_decoders(struct work_struct *work)

void ir_raw_init(void)

{

	/* Load the decoder modules */
@@ -365,12 +359,3 @@ static void init_decoders(struct work_struct *work) 
	   it is needed to change the CONFIG_MODULE test at rc-core.h

	 */

}
 
#endif



void ir_raw_init(void)

{

#ifdef MODULE

	INIT_WORK(&wq_load, init_decoders);

	schedule_work(&wq_load);

#endif

}

drivers/media/rc/rc-core-priv.h

+8 −8
Original line number Diff line number Diff line
@@ -165,56 +165,56 @@ void ir_raw_init(void); 


/* from ir-nec-decoder.c */

#ifdef CONFIG_IR_NEC_DECODER_MODULE

#define load_nec_decode()	request_module("ir-nec-decoder")

#define load_nec_decode()	request_module_nowait("ir-nec-decoder")

#else

static inline void load_nec_decode(void) { }

#endif



/* from ir-rc5-decoder.c */

#ifdef CONFIG_IR_RC5_DECODER_MODULE

#define load_rc5_decode()	request_module("ir-rc5-decoder")

#define load_rc5_decode()	request_module_nowait("ir-rc5-decoder")

#else

static inline void load_rc5_decode(void) { }

#endif



/* from ir-rc6-decoder.c */

#ifdef CONFIG_IR_RC6_DECODER_MODULE

#define load_rc6_decode()	request_module("ir-rc6-decoder")

#define load_rc6_decode()	request_module_nowait("ir-rc6-decoder")

#else

static inline void load_rc6_decode(void) { }

#endif



/* from ir-jvc-decoder.c */

#ifdef CONFIG_IR_JVC_DECODER_MODULE

#define load_jvc_decode()	request_module("ir-jvc-decoder")

#define load_jvc_decode()	request_module_nowait("ir-jvc-decoder")

#else

static inline void load_jvc_decode(void) { }

#endif



/* from ir-sony-decoder.c */

#ifdef CONFIG_IR_SONY_DECODER_MODULE

#define load_sony_decode()	request_module("ir-sony-decoder")

#define load_sony_decode()	request_module_nowait("ir-sony-decoder")

#else

static inline void load_sony_decode(void) { }

#endif



/* from ir-sanyo-decoder.c */

#ifdef CONFIG_IR_SANYO_DECODER_MODULE

#define load_sanyo_decode()	request_module("ir-sanyo-decoder")

#define load_sanyo_decode()	request_module_nowait("ir-sanyo-decoder")

#else

static inline void load_sanyo_decode(void) { }

#endif



/* from ir-mce_kbd-decoder.c */

#ifdef CONFIG_IR_MCE_KBD_DECODER_MODULE

#define load_mce_kbd_decode()	request_module("ir-mce_kbd-decoder")

#define load_mce_kbd_decode()	request_module_nowait("ir-mce_kbd-decoder")

#else

static inline void load_mce_kbd_decode(void) { }

#endif



/* from ir-lirc-codec.c */

#ifdef CONFIG_IR_LIRC_CODEC_MODULE

#define load_lirc_codec()	request_module("ir-lirc-codec")

#define load_lirc_codec()	request_module_nowait("ir-lirc-codec")

#else

static inline void load_lirc_codec(void) { }

#endif