Commit fa738644 authored Dec 04, 2012 by Benjamin Tissoires Committed by Jiri Kosina Dec 05, 2012

HID: i2c-hid: fix i2c_hid_dbg macro



This avoids the problematic case:

if (condition)
	i2c_hid_dbg(ihid, "Blah blah %d\n", i);
else
	do_something_very_important();

Which looks correct, however with the previous macro definition,
this expands to the unexpected:

if (condition) {
	if (debug)	\
		dev_printk(KERN_DEBUG, &ihid->client->dev,
				"Blah blah %d\n", i);
	else
		do_something_very_important();
}

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
Reviewed-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

parent ee8e8806

drivers/hid/i2c-hid/i2c-hid.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -51,8 +51,10 @@ module_param(debug, bool, 0444);
		MODULE_PARM_DESC(debug, "print a lot of debug information");

		#define i2c_hid_dbg(ihid, fmt, arg...) \
		do { \
		if (debug) \
		dev_printk(KERN_DEBUG, &(ihid)->client->dev, fmt, ##arg)
		dev_printk(KERN_DEBUG, &(ihid)->client->dev, fmt, ##arg); \
		} while (0)

		struct i2c_hid_desc {
		__le16 wHIDDescLength;