diff --git a/[refs] b/[refs]
index e57edc600d07..8bf1ca06985b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a21bdd9b960ccce421b63aa0e3efda4fcdc26f10
+refs/heads/master: 18fc31641925867c871bc75270ce642c039188d3
diff --git a/trunk/fs/nfs/callback.c b/trunk/fs/nfs/callback.c
index a886e692ddd0..6e3bd42c21cd 100644
--- a/trunk/fs/nfs/callback.c
+++ b/trunk/fs/nfs/callback.c
@@ -127,7 +127,9 @@ int nfs_callback_up(void)
 		nfs_callback_tcpport6 = ret;
 		dprintk("NFS: Callback listener port = %u (af %u)\n",
 				nfs_callback_tcpport6, PF_INET6);
-	} else if (ret != -EAFNOSUPPORT)
+	} else if (ret == -EAFNOSUPPORT)
+		ret = 0;
+	else
 		goto out_err;
 #endif	/* defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) */