Fix register name checks, name is a local array and will never be null, even when...

[madwifi/.git] / ath_hal / ah_os.c

diff --git a/ath_hal/ah_os.c b/ath_hal/ah_os.c
index b7ed2a2d8bc11709138f5020ce10ef36498d9afc..c8c38bdf9568a43b2a978dbc1f34eb7abd0597fd 100644 (file)
--- a/ath_hal/ah_os.c
+++ b/ath_hal/ah_os.c
@@ -599,7 +599,7 @@ _print_decoded_register_delta(struct ath_hal *ah, const char* device_name,
                device_name ? ":" : "",
               (regop == REGOP_READ ? "R:" : 
                (regop == REGOP_WRITE ? "W:" : "")), 
-               name ? name : "(unknown)",
+               (0 < strlen(name)) ? name : "(unknown)",
                address,
                v_new,
                BIT_STATUS(31),
@@ -707,7 +707,7 @@ _print_decoded_register_bitfields(struct ath_hal *ah, const char* device_name,
                       device_name ? ":" : "",
                       (regop == REGOP_READ ? "R:" : 
                        (regop == REGOP_WRITE ? "W:" : "")), 
-                       name ? name : "(unknown)",
+                       (0 < strlen(name)) ? name : "(unknown)",
                       (v & (1 << 31)                ? " (1 << 31)"     : ""),
                       (v & (1 << 30)                ? " (1 << 30)"     : ""),
                       (v & (1 << 29)                ? " (1 << 29)"     : ""),
@@ -751,7 +751,7 @@ _print_decoded_register_bitfields(struct ath_hal *ah, const char* device_name,
                       device_name ? ":" : "",
                       (regop == REGOP_READ ? "R:" : 
                        (regop == REGOP_WRITE ? "W:" : "")), 
-                       name ? name : "(unknown)",
+                       (0 < strlen(name)) ? name : "(unknown)",
                        (v & HAL_INT_GLOBAL           ?  " HAL_INT_GLOBAL" : ""),
                        (v & HAL_INT_FATAL            ?  " HAL_INT_FATAL"  : ""),
                        (v & (1 << 29)                ?  " (1  << 29)"     : ""),