diff options
author | John Stultz <john.stultz@linaro.org> | 2011-07-08 15:58:56 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2011-07-08 15:58:56 -0700 |
commit | a448bfbd8e15bb2ed380a75f20adeb6e8d752abb (patch) | |
tree | 1ab81f3867a5f7e0e9a6cc06fac678d670c2d464 /drivers/connector/connector.c | |
parent | 2aced4d6099ce987233ab2ffad42b90800dadf09 (diff) | |
parent | 0226f8a76da6bc97c9bb4af3fd2f6eeb03c5b0b0 (diff) |
Merge branch 'upstream/android-3.0' into linaro-android-3.0
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 219d88a0eea..dde6a0fad40 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c @@ -139,6 +139,7 @@ static int cn_call_callback(struct sk_buff *skb) spin_unlock_bh(&dev->cbdev->queue_lock); if (cbq != NULL) { + err = 0; cbq->callback(msg, nsp); kfree_skb(skb); cn_queue_release_callback(cbq); |