[ 3.5.y.z extended stable ] Patch "caif: Add missing braces to multiline if in" has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    caif: Add missing braces to multiline if in

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From d7ecec04dddaa7fe411f290ee473faf0bba4f504 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej at redhat.com>
Date: Thu, 5 Sep 2013 00:11:19 -0400
Subject: [PATCH] caif: Add missing braces to multiline if in
 cfctrl_linkup_request

commit 0c1db731bfcf3a9fd6c58132134f8b0f423552f0 upstream.

The indentation here implies this was meant to be a multi-line if.

Introduced several years back in commit c85c2951d4da1236e32f1858db418221e624aba5
("caif: Handle dev_queue_xmit errors.")

Signed-off-by: Dave Jones <davej at fedoraproject.org>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 net/caif/cfctrl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
index 047cd0e..61fe8d2 100644
--- a/net/caif/cfctrl.c
+++ b/net/caif/cfctrl.c
@@ -291,9 +291,10 @@ int cfctrl_linkup_request(struct cflayer *layer,

 		count = cfctrl_cancel_req(&cfctrl->serv.layer,
 						user_layer);
-		if (count != 1)
+		if (count != 1) {
 			pr_err("Could not remove request (%d)", count);
 			return -ENODEV;
+		}
 	}
 	return 0;
 }
--
1.8.3.2