From 15e02d4d023202823be4bc51dea647e50000ee97 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Thu, 24 Nov 2011 23:54:10 +0000
Subject: [PATCH] --- yaml --- r: 278260 b: refs/heads/master c:
 0f20f5a7de1ee48ced284e960828017cc2f5d52b h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/net/netrom/af_netrom.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0f664b8c1869..0b6cce39727a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10cae1c8dfbbdee55bdfcb7034f4c2c1197dc0a4
+refs/heads/master: 0f20f5a7de1ee48ced284e960828017cc2f5d52b
diff --git a/trunk/net/netrom/af_netrom.c b/trunk/net/netrom/af_netrom.c
index 732152f718e0..c329b474eace 100644
--- a/trunk/net/netrom/af_netrom.c
+++ b/trunk/net/netrom/af_netrom.c
@@ -1244,7 +1244,8 @@ static int nr_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 	case SIOCADDRT:
 	case SIOCDELRT:
 	case SIOCNRDECOBS:
-		if (!capable(CAP_NET_ADMIN)) return -EPERM;
+		if (!capable(CAP_NET_ADMIN))
+			return -EPERM;
 		return nr_rt_ioctl(cmd, argp);
 
 	default: