As compat includes linux/device.h well before iwlwifi, the
authorJohannes Berg <johannes.berg@intel.com>
Tue, 3 Jul 2012 13:28:28 +0000 (15:28 +0200)
committerLuis R. Rodriguez <mcgrof@frijolero.org>
Mon, 9 Jul 2012 22:26:59 +0000 (15:26 -0700)
definitions from there are used without DEBUG, but iwlwifi
defines DEBUG to get debug output. Use dev_printk instead
of dev_dbg to get debugging back.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
patches/57-iwlwifi-debug-fix.patch [new file with mode: 0644]

diff --git a/patches/57-iwlwifi-debug-fix.patch b/patches/57-iwlwifi-debug-fix.patch
new file mode 100644 (file)
index 0000000..4b2dfa9
--- /dev/null
@@ -0,0 +1,19 @@
+Due to compat including linux/device.h before we do,
+we don't get a chance to #define DEBUG to get our
+debugging prints. This patch replaces dev_dbg with
+dev_printk to make them show up again.
+
+--- a/drivers/net/wireless/iwlwifi/iwl-debug.c
++++ b/drivers/net/wireless/iwlwifi/iwl-debug.c
+@@ -138,8 +138,9 @@ void __iwl_dbg(struct device *dev,
+               va_copy(args2, args);
+               vaf.va = &args2;
+-              dev_dbg(dev, "%c %s %pV", in_interrupt() ? 'I' : 'U',
+-                      function, &vaf);
++              dev_printk(KERN_DEBUG, dev, "%c %s %pV",
++                         in_interrupt() ? 'I' : 'U',
++                         function, &vaf);
+               va_end(args2);
+       }
+ #endif