From 2ccc36d2174def2f877f4c063641d406d88e1737 Mon Sep 17 00:00:00 2001 From: Robert Marklund Date: Thu, 23 Jun 2011 13:33:59 +0200 Subject: caif fix merge problems merge with org commit. Signed-off-by: Robert Marklund --- net/caif/cfmuxl.c | 1 - 1 file changed, 1 deletion(-) (limited to 'net') diff --git a/net/caif/cfmuxl.c b/net/caif/cfmuxl.c index 5b17de51f64..4884e189ad5 100644 --- a/net/caif/cfmuxl.c +++ b/net/caif/cfmuxl.c @@ -254,6 +254,5 @@ static void cfmuxl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, if (cfsrvl_phyid_match(layer, phyid)) layer->ctrlcmd(layer, ctrl, phyid); } - } rcu_read_unlock(); } -- cgit v1.2.3