diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-30 17:53:32 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-30 17:53:32 -0400 |
| commit | 65fb0d23fcddd8697c871047b700c78817bdaa43 (patch) | |
| tree | 119e6e5f276622c4c862f6c9b6d795264ba1603a /net/iucv/af_iucv.c | |
| parent | 8c083f081d0014057901c68a0a3e0f8ca7ac8d23 (diff) | |
| parent | dfbbe89e197a77f2c8046a51c74e33e35f878080 (diff) | |
Merge branch 'linus' into cpumask-for-linus
Conflicts:
arch/x86/kernel/cpu/common.c
Diffstat (limited to 'net/iucv/af_iucv.c')
| -rw-r--r-- | net/iucv/af_iucv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c index eb8a2a0b6eb7..49e786535dc8 100644 --- a/net/iucv/af_iucv.c +++ b/net/iucv/af_iucv.c | |||
| @@ -1171,8 +1171,7 @@ static void iucv_callback_txdone(struct iucv_path *path, | |||
| 1171 | 1171 | ||
| 1172 | spin_unlock_irqrestore(&list->lock, flags); | 1172 | spin_unlock_irqrestore(&list->lock, flags); |
| 1173 | 1173 | ||
| 1174 | if (this) | 1174 | kfree_skb(this); |
| 1175 | kfree_skb(this); | ||
| 1176 | } | 1175 | } |
| 1177 | BUG_ON(!this); | 1176 | BUG_ON(!this); |
| 1178 | 1177 | ||