diff --git a/[refs] b/[refs]
index 4c5075adf27a..f792fac62421 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa90b077d72b4ea92706e86fdff7b5dca294caa3
+refs/heads/master: 896ee0eee6261e30c3623be931c3f621428947df
diff --git a/trunk/net/irda/af_irda.c b/trunk/net/irda/af_irda.c
index d07e3a626446..d28e7f014cc6 100644
--- a/trunk/net/irda/af_irda.c
+++ b/trunk/net/irda/af_irda.c
@@ -2583,8 +2583,10 @@ static int irda_getsockopt(struct socket *sock, int level, int optname,
 				    NULL, NULL, NULL);
 
 		/* Check if the we got some results */
-		if (!self->cachedaddr)
-			return -EAGAIN;		/* Didn't find any devices */
+		if (!self->cachedaddr) {
+			err = -EAGAIN;		/* Didn't find any devices */
+			goto out;
+		}
 		daddr = self->cachedaddr;
 		/* Cleanup */
 		self->cachedaddr = 0;