From: Johannes Stezenbach o don't call av7110_ir_init() if driver initialization failed already due to previous errors (resulted in Oops in out-of-memory conditions) (me) o don't do av7110_ir_exit if init was not done (Kenneth Aafloy) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton --- 25-akpm/drivers/media/dvb/ttpci/av7110.c | 15 +++------------ 25-akpm/drivers/media/dvb/ttpci/av7110_ir.c | 8 ++++++++ 2 files changed, 11 insertions(+), 12 deletions(-) diff -puN drivers/media/dvb/ttpci/av7110.c~dvb-av7110-fix-oops-when-av7110_ir_init-failed drivers/media/dvb/ttpci/av7110.c --- 25/drivers/media/dvb/ttpci/av7110.c~dvb-av7110-fix-oops-when-av7110_ir_init-failed 2005-03-21 20:58:00.000000000 -0800 +++ 25-akpm/drivers/media/dvb/ttpci/av7110.c 2005-03-21 20:58:00.000000000 -0800 @@ -2453,6 +2453,9 @@ err_no_mem: av7110->dvb_adapter->priv = av7110; frontend_init(av7110); +#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE) + av7110_ir_init(); +#endif printk(KERN_INFO "dvb-ttpci: found av7110-%d.\n", av7110_num); av7110->device_initialized = 1; av7110_num++; @@ -2640,18 +2643,6 @@ static int __init av7110_init(void) { int retval; retval = saa7146_register_extension(&av7110_extension); -#if defined(CONFIG_INPUT_EVDEV) || defined(CONFIG_INPUT_EVDEV_MODULE) - if (retval) - goto failed_saa7146_register; - - retval = av7110_ir_init(); - if (retval) - goto failed_av7110_ir_init; - return 0; -failed_av7110_ir_init: - saa7146_unregister_extension(&av7110_extension); -failed_saa7146_register: -#endif return retval; } diff -puN drivers/media/dvb/ttpci/av7110_ir.c~dvb-av7110-fix-oops-when-av7110_ir_init-failed drivers/media/dvb/ttpci/av7110_ir.c --- 25/drivers/media/dvb/ttpci/av7110_ir.c~dvb-av7110-fix-oops-when-av7110_ir_init-failed 2005-03-21 20:58:00.000000000 -0800 +++ 25-akpm/drivers/media/dvb/ttpci/av7110_ir.c 2005-03-21 20:58:00.000000000 -0800 @@ -12,6 +12,7 @@ /* enable ir debugging by or'ing av7110_debug with 16 */ +static int ir_initialized; static struct input_dev input_dev; static u32 ir_config; @@ -160,6 +161,9 @@ static int av7110_ir_write_proc(struct f int __init av7110_ir_init(void) { + if (ir_initialized) + return 0; + static struct proc_dir_entry *e; init_timer(&keyup_timer); @@ -187,16 +191,20 @@ int __init av7110_ir_init(void) e->size = 4 + 256 * sizeof(u16); } + ir_initialized = 1; return 0; } void __exit av7110_ir_exit(void) { + if (ir_initialized == 0) + return; del_timer_sync(&keyup_timer); remove_proc_entry("av7110_ir", NULL); av7110_unregister_irc_handler(av7110_emit_key); input_unregister_device(&input_dev); + ir_initialized = 0; } //MODULE_AUTHOR("Holger Waechtler "); _