diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-23 13:33:59 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:41 +0200 |
| commit | 2ccc36d2174def2f877f4c063641d406d88e1737 (patch) | |
| tree | ec562b79ee118c9cfb95decc9095ecae68109388 /net | |
| parent | 9650f0bb4537ef83d6ca8e788ed4ac606246ba11 (diff) | |
caif fix merge problems merge with org commit.
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/caif/cfmuxl.c | 1 |
1 files changed, 0 insertions, 1 deletions
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(); } |