diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-02-22 15:10:22 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-22 15:10:22 -0500 |
| commit | 5db5e44cdcdc5ee9cc821bd4d63445af0bb34bce (patch) | |
| tree | b5e5787a6d5c15e589d275c7434ebbf341257234 /drivers/net/wireless/zd1211rw/zd_def.h | |
| parent | db62983a1e4b2af9e79c97af768f0c8b80bd93f0 (diff) | |
| parent | 320d6c1b56de5f461c6062625b9664095f90ee95 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_def.h')
| -rw-r--r-- | drivers/net/wireless/zd1211rw/zd_def.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_def.h b/drivers/net/wireless/zd1211rw/zd_def.h index 6ac597ffd3b9..5463ca9ebc01 100644 --- a/drivers/net/wireless/zd1211rw/zd_def.h +++ b/drivers/net/wireless/zd1211rw/zd_def.h | |||
| @@ -45,7 +45,7 @@ typedef u16 __nocast zd_addr_t; | |||
| 45 | #ifdef DEBUG | 45 | #ifdef DEBUG |
| 46 | # define ZD_ASSERT(x) \ | 46 | # define ZD_ASSERT(x) \ |
| 47 | do { \ | 47 | do { \ |
| 48 | if (!(x)) { \ | 48 | if (unlikely(!(x))) { \ |
| 49 | pr_debug("%s:%d ASSERT %s VIOLATED!\n", \ | 49 | pr_debug("%s:%d ASSERT %s VIOLATED!\n", \ |
| 50 | __FILE__, __LINE__, __stringify(x)); \ | 50 | __FILE__, __LINE__, __stringify(x)); \ |
| 51 | dump_stack(); \ | 51 | dump_stack(); \ |