diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-23 13:33:59 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@linaro.org> | 2011-07-22 15:50:53 +0200 |
| commit | 4e5176a567166769c29a39f66959b81efae11e47 (patch) | |
| tree | 701fdac42442fa8d04358e43b98afb2b5ef6e2b1 | |
| parent | 57deafbfddc25f3ccde00e32e0b6cf94896587ca (diff) | |
caif fix merge problems merge with org commit.
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
| -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(); } |