diff options
| author | Alan Cox <alan@redhat.com> | 2008-05-23 13:04:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-24 09:56:11 -0700 |
| commit | 6089093e588ee3f6aed99d08b1cf5ea37c52cf97 (patch) | |
| tree | 0adbc19f348c660e9e7bed631b82bc3033a61863 | |
| parent | bff5fda972dc23bd1806a47c2098ae173585d013 (diff) | |
| download | linux-3.10-6089093e588ee3f6aed99d08b1cf5ea37c52cf97.tar.gz linux-3.10-6089093e588ee3f6aed99d08b1cf5ea37c52cf97.tar.bz2 linux-3.10-6089093e588ee3f6aed99d08b1cf5ea37c52cf97.zip | |
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>
| -rw-r--r-- | drivers/char/ip2/Makefile | 4 | ||||
| -rw-r--r-- | drivers/char/ip2/ip2main.c | 23 |
2 files changed, 2 insertions, 25 deletions
diff --git a/drivers/char/ip2/Makefile b/drivers/char/ip2/Makefile index 6bfe2543ddc..939618f62fe 100644 --- a/drivers/char/ip2/Makefile +++ b/drivers/char/ip2/Makefile @@ -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 diff --git a/drivers/char/ip2/ip2main.c b/drivers/char/ip2/ip2main.c index 70957acaa96..c12cf8fc4be 100644 --- a/drivers/char/ip2/ip2main.c +++ b/drivers/char/ip2/ip2main.c @@ -346,27 +346,6 @@ have_requested_irq( char irq ) } /******************************************************************************/ -/* 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 */ /* Returns: Nothing */ @@ -779,8 +758,6 @@ out: return err; } -EXPORT_SYMBOL(ip2_loadmain); - /******************************************************************************/ /* Function: ip2_init_board() */ /* Parameters: Index of board in configuration structure */ |