summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorHemant Ramdasi <hemant.ramdasi@stericsson.com>2011-09-07 16:22:15 +0530
committerUlf Hansson <ulf.hansson@stericsson.com>2011-09-19 16:07:24 +0200
commit7f6175fd33162ac9ec4ef81cecdb47580f629473 (patch)
treeaa6f9e7ecba3e51d25805a8abd2693d8d8b89293 /net
parent8ab0ce0457fac8e8677233993dd38e3b10a91f53 (diff)
Revert "caif fix merge problems merge with org commit."
This reverts commit 4e5176a567166769c29a39f66959b81efae11e47. Signed-off-by: Hemant Ramdasi <hemant.ramdasi@stericsson.com> Change-Id: I66de7f9a713c056ce974355e6c28feac2282aec7 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30327
Diffstat (limited to 'net')
-rw-r--r--net/caif/cfmuxl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/caif/cfmuxl.c b/net/caif/cfmuxl.c
index 4884e189ad5..5b17de51f64 100644
--- a/net/caif/cfmuxl.c
+++ b/net/caif/cfmuxl.c
@@ -254,5 +254,6 @@ 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();
}