From 9a003c65215aa35c4aa865045c79b254df982f73 Mon Sep 17 00:00:00 2001
From: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Date: Sat, 12 Feb 2011 20:43:51 +0200
Subject: [PATCH] --- yaml --- r: 237378 b: refs/heads/master c:
 91f71fa5da00ff50398d8592f304cfec54eed550 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/wireless/zd1211rw/zd_def.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5c26f7b8b4a6..659d867a7b48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8662b2518ff7995002378058488326ef7cb80de8
+refs/heads/master: 91f71fa5da00ff50398d8592f304cfec54eed550
diff --git a/trunk/drivers/net/wireless/zd1211rw/zd_def.h b/trunk/drivers/net/wireless/zd1211rw/zd_def.h
index 6ac597ffd3b9..5463ca9ebc01 100644
--- a/trunk/drivers/net/wireless/zd1211rw/zd_def.h
+++ b/trunk/drivers/net/wireless/zd1211rw/zd_def.h
@@ -45,7 +45,7 @@ typedef u16 __nocast zd_addr_t;
 #ifdef DEBUG
 #  define ZD_ASSERT(x) \
 do { \
-	if (!(x)) { \
+	if (unlikely(!(x))) { \
 		pr_debug("%s:%d ASSERT %s VIOLATED!\n", \
 			__FILE__, __LINE__, __stringify(x)); \
 		dump_stack(); \