diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-26 22:46:54 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-26 22:46:54 -0800 |
| commit | 63748aa8cd20a6bfb4a8ef3be9b51bec5e38ab72 (patch) | |
| tree | 380eb052c1b93ce11535ffab7f29c4e3d02a7697 /net/bluetooth/cmtp/core.c | |
| parent | 43be63662db56de3f87cb4a86bfe062a9797be65 (diff) | |
| parent | b1fb06830dc870d862f7f80e276130c0ab84d59f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/cmtp/core.c')
| -rw-r--r-- | net/bluetooth/cmtp/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c index c9cac7719ef..0073ec8495d 100644 --- a/net/bluetooth/cmtp/core.c +++ b/net/bluetooth/cmtp/core.c @@ -126,8 +126,7 @@ static inline void cmtp_add_msgpart(struct cmtp_session *session, int id, const session->reassembly[id] = nskb; - if (skb) - kfree_skb(skb); + kfree_skb(skb); } static inline int cmtp_recv_frame(struct cmtp_session *session, struct sk_buff *skb) |