From a04a8492ede5b847504c2ac554657e7f97c0f9c4 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 5 Nov 2009 22:37:11 -0800
Subject: [PATCH] --- yaml --- r: 171184 b: refs/heads/master c:
 000ba2e43f33901859fd794bb33c885909d53b3b h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/core/sock.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a0b7872ad539..901443b5cf5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: baac8564547ac7f944af1c2e8cc6fdd57f2836a4
+refs/heads/master: 000ba2e43f33901859fd794bb33c885909d53b3b
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index 38820eaecd43..76ff58d43e26 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -417,9 +417,8 @@ static int sock_bindtodevice(struct sock *sk, char __user *optval, int optlen)
 	if (copy_from_user(devname, optval, optlen))
 		goto out;
 
-	if (devname[0] == '\0') {
-		index = 0;
-	} else {
+	index = 0;
+	if (devname[0] != '\0') {
 		struct net_device *dev;
 
 		rcu_read_lock();