diff --git a/[refs] b/[refs]
index ddcddb33ddd3..5dab8265eab0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f11a869d4e38397ac81f2a3d22e8d2aeb3992b0f
+refs/heads/master: 3be8fbab18fbc06b6ff94a56f9c225e29ea64a73
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index b7c457adc0dc..729ed533bb33 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -1594,7 +1594,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 
 		if (tun->flags & TUN_TAP_MQ &&
 		    (tun->numqueues + tun->numdisabled > 1))
-			return err;
+			return -EBUSY;
 	}
 	else {
 		char *name;