From 7828bed40db97a99f3cbe89b76030529628bcb6e Mon Sep 17 00:00:00 2001
From: christos <christos@NetBSD.org>
Date: Mon, 30 Jul 2012 10:45:03 +0000
Subject: [PATCH] remove infinite loop on error, extra parens on return.

---
 sys/kern/uipc_usrreq.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index e6504c520688..c82282e7153c 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_usrreq.c,v 1.138 2012/07/30 10:42:24 christos Exp $	*/
+/*	$NetBSD: uipc_usrreq.c,v 1.139 2012/07/30 10:45:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.138 2012/07/30 10:42:24 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_usrreq.c,v 1.139 2012/07/30 10:45:03 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1341,12 +1341,11 @@ unp_externalize(struct mbuf *rights, struct lwp *l, int flags)
 			*rp++ = 0;
 			unp_discard_now(fp);
 		}
-		goto out;
 	}
 
 	rw_exit(&p->p_cwdi->cwdi_lock);
 	kmem_free(fdp, nfds * sizeof(int));
-	return (error);
+	return error;
 }
 
 int