OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ip2: fix crashes on load/unload 

This doesn't need to be two modules, and making it one cleans up the
problem

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox 2008-05-23 13:04:45 -07:00 committed by Linus Torvalds
parent bff5fda972
commit 6089093e58
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/char/ip2/Makefile
View File

@ -2,7 +2,7 @@
# Makefile for the Computone IntelliPort Plus Driver
#
obj-$(CONFIG_COMPUTONE) += ip2.o ip2main.o
obj-$(CONFIG_COMPUTONE) += ip2.o
ip2-objs := ip2base.o
ip2-objs := ip2base.o ip2main.o

23
drivers/char/ip2/ip2main.c
View File

@ -345,27 +345,6 @@ have_requested_irq( char irq )
return 0;
}
/******************************************************************************/
/* Function: init_module() */
/* Parameters: None */
/* Returns: Success (0) */
/* */
/* Description: */
/* This is a required entry point for an installable module. It simply calls */
/* the driver initialisation function and returns what it returns. */
/******************************************************************************/
#ifdef MODULE
static int __init
ip2_init_module(void)
{
#ifdef IP2DEBUG_INIT
printk (KERN_DEBUG "Loading module ...\n" );
#endif
return 0;
}
module_init(ip2_init_module);
#endif /* MODULE */
/******************************************************************************/
/* Function: cleanup_module() */
/* Parameters: None */
@ -779,8 +758,6 @@ out:
return err;
}
EXPORT_SYMBOL(ip2_loadmain);
/******************************************************************************/
/* Function: ip2_init_board() */
/* Parameters: Index of board in configuration structure */