From 00e7e88b5b12735cb5744db16c902e314f935fc7 Mon Sep 17 00:00:00 2001
From: Kurt Kanzenbach <ly80toro@cip.cs.fau.de>
Date: Fri, 22 Feb 2013 12:13:30 +0100
Subject: [PATCH] --- yaml --- r: 363338 b: refs/heads/master c:
 6f19a2b1c386d6ef75bcfebf5c1a68d28658d62e h: refs/heads/master v: v3

---
 [refs]                                               |  2 +-
 trunk/drivers/staging/usbip/userspace/libsrc/names.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index b953b2da36f8..f9aecb046b3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9db91e1b4cdf23c28f7f932376bcdeafbd1aee28
+refs/heads/master: 6f19a2b1c386d6ef75bcfebf5c1a68d28658d62e
diff --git a/trunk/drivers/staging/usbip/userspace/libsrc/names.c b/trunk/drivers/staging/usbip/userspace/libsrc/names.c
index a66f5391e5dc..3b151dff85a6 100644
--- a/trunk/drivers/staging/usbip/userspace/libsrc/names.c
+++ b/trunk/drivers/staging/usbip/userspace/libsrc/names.c
@@ -491,9 +491,11 @@ static void parse(FILE *f)
 	while (fgets(buf, sizeof(buf), f)) {
 		linectr++;
 		/* remove line ends */
-		if ((cp = strchr(buf, 13)))
+		cp = strchr(buf, 13);
+		if (cp)
 			*cp = 0;
-		if ((cp = strchr(buf, 10)))
+		cp = strchr(buf, 10);
+		if (cp)
 			*cp = 0;
 		if (buf[0] == '#' || !buf[0])
 			continue;
@@ -857,9 +859,10 @@ int names_init(char *n)
 {
 	FILE *f;
 
-	if (!(f = fopen(n, "r"))) {
+	f = fopen(n, "r");
+	if (!f)
 		return errno;
-	}
+
 	parse(f);
 	fclose(f);
 	return 0;