diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 03:00:06 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 03:00:06 -0400 |
| commit | 4c8440666b995f20604852b35dcfdbcc1d5931f1 (patch) | |
| tree | b3b6cd65ee275ba1adf9d2c050063f30ebbadb91 /drivers/connector/connector.c | |
| parent | 751e1f5099f1568444fe2485f2485ca541d4952e (diff) | |
| parent | c560bbceaf6b06e52f1ef20131b76a3fdc0a2c19 (diff) | |
Merge branch 'merge' into next
Diffstat (limited to 'drivers/connector/connector.c')
| -rw-r--r-- | drivers/connector/connector.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c index d77005849af8..219d88a0eeae 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c | |||
| @@ -142,6 +142,7 @@ static int cn_call_callback(struct sk_buff *skb) | |||
| 142 | cbq->callback(msg, nsp); | 142 | cbq->callback(msg, nsp); |
| 143 | kfree_skb(skb); | 143 | kfree_skb(skb); |
| 144 | cn_queue_release_callback(cbq); | 144 | cn_queue_release_callback(cbq); |
| 145 | err = 0; | ||
| 145 | } | 146 | } |
| 146 | 147 | ||
| 147 | return err; | 148 | return err; |