From c8b941c322083f49c6a8a1760f917e368bd1a473 Mon Sep 17 00:00:00 2001
From: William Blair <wdblair@bu.edu>
Date: Wed, 13 Jun 2012 01:16:49 -0400
Subject: [PATCH] --- yaml --- r: 317326 b: refs/heads/master c:
 a2c49a9ac993fa2b4795890d5fa56f2fc002453e h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/staging/keucr/scsiglue.c | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 82667f45e6d1..bf8dce5f8846 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b38e274fdb6dfa2dd77598b8b6e2c32d7608f494
+refs/heads/master: a2c49a9ac993fa2b4795890d5fa56f2fc002453e
diff --git a/trunk/drivers/staging/keucr/scsiglue.c b/trunk/drivers/staging/keucr/scsiglue.c
index e1f3931d41e0..083b20e6253e 100644
--- a/trunk/drivers/staging/keucr/scsiglue.c
+++ b/trunk/drivers/staging/keucr/scsiglue.c
@@ -230,7 +230,10 @@ void usb_stor_report_bus_reset(struct us_data *us)
 /* we use this macro to help us write into the buffer */
 #undef SPRINTF
 #define SPRINTF(args...) \
-	do { if (pos < buffer+length) pos += sprintf(pos, ## args); } while (0)
+	do { \
+		if (pos < buffer+length) \
+			pos += sprintf(pos, ## args); \
+	} while (0)
 
 /*
  * proc_info()
@@ -279,8 +282,10 @@ static int proc_info(struct Scsi_Host *host, char *buffer, char **start,
 		pos += sprintf(pos, "       Quirks:");
 
 #define US_FLAG(name, value) \
-	if (us->fflags & value)\
-		pos += sprintf(pos, " " #name);
+	do { \
+		if (us->fflags & value) \
+			pos += sprintf(pos, " " #name); \
+	} while (0);
 US_DO_ALL_FLAGS
 #undef US_FLAG