[PATCH] ip2: Fix crashes on load/unload

[PATCH] ip2: Fix crashes on load/unload

[Alan Cox]

From: Alan Cox <alan@redhat.com>

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

 drivers/char/ip2/Makefile  |    4 ++--
 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 6bfe254..939618f 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 70957ac..c12cf8f 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                      */

Re: [PATCH] ip2: Fix crashes on load/unload

[Alan Cox]

On Mon, 19 May 2008 17:27:44 +0200
Jiri Slaby <jirislaby@gmail.com> wrote:

> On 05/19/2008 03:20 PM, Alan Cox wrote:
> > From: Alan Cox <alan@redhat.com>
> > 
> > This doesn't need to be two modules, and making it one cleans up the
> > problem
> > ---
> > 
> 
> Seems OK, but all your patches misses S-O-F line...

Signed-off-by: Alan Cox <alan@redhat.com> for the watchdog series, tty
series and this fix.

I'll go and have a stern word with the tool management gnome

Re: [PATCH] ip2: Fix crashes on load/unload

[Jiri Slaby]

On 05/19/2008 03:20 PM, Alan Cox wrote:
> From: Alan Cox <alan@redhat.com>
> 
> This doesn't need to be two modules, and making it one cleans up the
> problem
> ---
> 

Seems OK, but all your patches misses S-O-F line...

Re: [PATCH] ip2: Fix crashes on load/unload

[Jiri Slaby]

On 05/19/2008 05:27 PM, Jiri Slaby wrote:
> On 05/19/2008 03:20 PM, Alan Cox wrote:
>> From: Alan Cox <alan@redhat.com>
>>
>> This doesn't need to be two modules, and making it one cleans up the
>> problem
>> ---
>>
> 
> Seems OK, but all your patches misses S-O-F line...

s/S-O-F/S-O-B