Fixed a problem in mouse_load_driver: The driver was not removed from memory

when the load failed.


git-svn-id: svn://svn.cc65.org/cc65/trunk@3748 b7a2c559-68d2-44c3-8de9-860c34a00d81

libsrc/mouse/mouse-kernel.s

@@ -162,7 +162,7 @@ _mouse_uninstall:
 	jsr     uninstall_irq           ; Disable driver interrupts
         jsr     mouse_uninstall         ; Call driver routine
 
-mouse_clear_ptr:                        ; External entry point
+_mouse_clear_ptr:                       ; External entry point
         lda     #0
         sta     _mouse_drv
         sta     _mouse_drv+1            ; Clear the driver pointer
@@ -170,3 +170,4 @@ mouse_clear_ptr:                        ; External entry point
         tax
         rts                             ; Return zero
 
+		   

libsrc/mouse/mouse_load.c

@@ -75,9 +75,22 @@ unsigned char __fastcall__ mouse_load_driver (const struct mouse_callbacks* c,
         if (Res == MLOAD_OK) {
 
             /* Check the driver signature, install the driver */
-            return mouse_install (c, ctrl.module);
+            Res = mouse_install (c, ctrl.module);
 
+	    /* If the driver did not install correctly, remove it from
+	     * memory again.
+	     */
+	    if (Res != MLOAD_OK) { 
+                /* Do not call mouse_uninstall here, since the driver is not
+                 * correctly installed.
+                 */
+                mod_free (mouse_drv);
+                mouse_clear_ptr ();
+            }
         }
+
+        /* Return the error code */
+        return Res;
     }
 
     /* Error loading the driver */