netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] trivial: net/irda/irlmp.c: Fix closing brace followed by if
@ 2014-06-20 19:48 Rasmus Villemoes
  2014-06-23 22:04 ` David Miller
  0 siblings, 1 reply; 2+ messages in thread
From: Rasmus Villemoes @ 2014-06-20 19:48 UTC (permalink / raw)
  To: Samuel Ortiz, David S. Miller, Jiri Kosina
  Cc: netdev, linux-kernel, Rasmus Villemoes

Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
---
 net/irda/irlmp.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c
index 98ad6ec..a5f28d4 100644
--- a/net/irda/irlmp.c
+++ b/net/irda/irlmp.c
@@ -1426,7 +1426,8 @@ __u8 *irlmp_hint_to_service(__u8 *hint)
 		if (hint[1] & HINT_TELEPHONY) {
 			IRDA_DEBUG(1, "Telephony ");
 			service[i++] = S_TELEPHONY;
-		} if (hint[1] & HINT_FILE_SERVER)
+		}
+		if (hint[1] & HINT_FILE_SERVER)
 			IRDA_DEBUG(1, "File Server ");
 
 		if (hint[1] & HINT_COMM) {
-- 
1.9.2

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] trivial: net/irda/irlmp.c: Fix closing brace followed by if
  2014-06-20 19:48 [PATCH] trivial: net/irda/irlmp.c: Fix closing brace followed by if Rasmus Villemoes
@ 2014-06-23 22:04 ` David Miller
  0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-06-23 22:04 UTC (permalink / raw)
  To: linux; +Cc: samuel, trivial, netdev, linux-kernel

From: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Date: Fri, 20 Jun 2014 21:48:00 +0200

> Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>

Applied to net-next, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-06-23 22:04 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-20 19:48 [PATCH] trivial: net/irda/irlmp.c: Fix closing brace followed by if Rasmus Villemoes
2014-06-23 22:04 ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).