---

yaml --- r: 235813 b: refs/heads/master c: f8cc1e9 h: refs/heads/master i: 235811: dd517b7 v: v3
git-mirror · Feb 4, 2011 · 07c9cf8 · 07c9cf8
1 parent 25c2858
commit 07c9cf8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 055e3a3a2cdcb7d39d14857e2fb2175c11168ee7
+refs/heads/master: f8cc1e9373c253902a219ec805977d3b4f16a86c
diff --git a/trunk/drivers/staging/easycap/easycap.h b/trunk/drivers/staging/easycap/easycap.h
@@ -596,19 +596,19 @@ struct signed_div_result {
  */
 /*---------------------------------------------------------------------------*/
 #define GET(X, Y, Z) do { \
-	int rc; \
+	int __rc; \
 	*(Z) = (u16)0; \
-	rc = regget(X, Y, Z); \
-	if (0 > rc) { \
-		JOT(8, ":-(%i\n", __LINE__);  return(rc); \
+	__rc = regget(X, Y, Z); \
+	if (0 > __rc) { \
+		JOT(8, ":-(%i\n", __LINE__);  return __rc; \
 	} \
 } while (0)
 
 #define SET(X, Y, Z) do { \
-	int rc; \
-	rc = regset(X, Y, Z); \
-	if (0 > rc) { \
-		JOT(8, ":-(%i\n", __LINE__);  return(rc); \
+	int __rc; \
+	__rc = regset(X, Y, Z); \
+	if (0 > __rc) { \
+		JOT(8, ":-(%i\n", __LINE__);  return __rc; \
 	} \
 } while (0)
 /*---------------------------------------------------------------------------*/