From 9ca5eefbdba75dcf548fba61658ddd721170d463 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 19 Mar 2013 20:26:57 +0100
Subject: [PATCH] --- yaml --- r: 362037 b: refs/heads/master c:
 ce1eadda6badef9e4e3460097ede674fca47383d h: refs/heads/master i:   362035:
 abf1cb7e44512f9e4c5d47dec8dc4e8d606b9b2a v: v3

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

diff --git a/[refs] b/[refs]
index 3208667aee31..9eea6223f7ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07e5a5f5ab7474589c15fc5d88e4f7fc43979530
+refs/heads/master: ce1eadda6badef9e4e3460097ede674fca47383d
diff --git a/trunk/net/wireless/trace.h b/trunk/net/wireless/trace.h
index 6847d043edea..7586de77a2f8 100644
--- a/trunk/net/wireless/trace.h
+++ b/trunk/net/wireless/trace.h
@@ -27,7 +27,8 @@
 #define WIPHY_PR_ARG	__entry->wiphy_name
 
 #define WDEV_ENTRY	__field(u32, id)
-#define WDEV_ASSIGN	(__entry->id) = (wdev ? wdev->identifier : 0)
+#define WDEV_ASSIGN	(__entry->id) = (!IS_ERR_OR_NULL(wdev)	\
+					 ? wdev->identifier : 0)
 #define WDEV_PR_FMT	"wdev(%u)"
 #define WDEV_PR_ARG	(__entry->id)