diff --git a/[refs] b/[refs]
index 2a330648422a..bb34077aac65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50f238fdf38e37f0350be17c36e3ec0fd298cc40
+refs/heads/master: 460deefae62db4472e8bd16b21c7d70f3c7fd785
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index c3927b423743..92ffd11a7195 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -995,7 +995,6 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 				goto err_free_sk;
 		}
 
-		err = -EINVAL;
 		err = register_netdevice(tun->dev);
 		if (err < 0)
 			goto err_free_sk;