diff --git a/[refs] b/[refs]
index 2b67c61354a9..453d6e711dbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 332e008a44d1ab6ca85b2214578f2f89af04a2fc
+refs/heads/master: 0af39507f60ee9f98b20f24af09c1a60655417ac
diff --git a/trunk/net/sunrpc/svc.c b/trunk/net/sunrpc/svc.c
index 3bf5a54982ba..dfa4ba69ff45 100644
--- a/trunk/net/sunrpc/svc.c
+++ b/trunk/net/sunrpc/svc.c
@@ -950,7 +950,9 @@ int svc_register(const struct svc_serv *serv, struct net *net,
 	unsigned int		i;
 	int			error = 0;
 
-	BUG_ON(proto == 0 && port == 0);
+	WARN_ON_ONCE(proto == 0 && port == 0);
+	if (proto == 0 && port == 0)
+		return -EINVAL;
 
 	for (progp = serv->sv_program; progp; progp = progp->pg_next) {
 		for (i = 0; i < progp->pg_nvers; i++) {