[Madwifi-cvs] revision 2490 committed

[Matthew W. S. B. <svn...@ma...>]

Project     : madwifi
Revision    : 2490
Author      : mentor (Matthew W. S. Bell)
Date        : 2007-06-20 19:34:05 +0200 (Wed, 20 Jun 2007)

Log Message :
Release OpenHAL on module_get failure

Affected Files:
* branches/madwifi-old-openhal/openhal/ah_osdep.c     updated             


Modified: branches/madwifi-old-openhal/openhal/ah_osdep.c
===================================================================
--- branches/madwifi-old-openhal/openhal/ah_osdep.c	2007-06-20 17:07:58 UTC (rev 2489)
+++ branches/madwifi-old-openhal/openhal/ah_osdep.c	2007-06-20 17:34:05 UTC (rev 2490)
@@ -25,18 +25,6 @@
 /*Definitions for module loading/unloading 
  *combatible with 2.4 and 2.6 kernels*/
 
-#ifndef __MOD_INC_USE_COUNT
-#define AH_MOD_INC_USE_COUNT(_m)                                        \
-        if (!try_module_get(_m)) {                                      \
-                printk(KERN_WARNING "try_module_get failed\n");         \
-                return NULL;                                            \
-        }
-#define AH_MOD_DEC_USE_COUNT(_m)        module_put(_m)
-#else
-#define AH_MOD_INC_USE_COUNT(_m)        MOD_INC_USE_COUNT
-#define AH_MOD_DEC_USE_COUNT(_m)        MOD_DEC_USE_COUNT
-#endif
-
 static char *dev_info = "ath_hal";
 
 MODULE_AUTHOR("Nick Kossifidis");
@@ -57,7 +45,16 @@
 
         *(AR5K_STATUS *)s = status;
         if (ah)
-                AH_MOD_INC_USE_COUNT(THIS_MODULE);
+#ifndef __MOD_INC_USE_COUNT
+		if (!try_module_get(THIS_MODULE)) {
+			printk(KERN_WARNING "try_module_get failed\n");
+			ath_hal_detach(ah);
+			return NULL;
+		}
+#else
+		MOD_INC_USE_COUNT;
+#endif
+
         return ah;
 }
 
@@ -65,7 +62,11 @@
 ath_hal_detach(struct ath_hal *ah)
 {
         (*ah->ah_detach)(ah);
-        AH_MOD_DEC_USE_COUNT(THIS_MODULE);
+#ifndef __MOD_INC_USE_COUNT
+	module_put(THIS_MODULE);
+#else
+	MOD_DEC_USE_COUNT;
+#endif
 }
 
 EXPORT_SYMBOL(ath_hal_probe);