diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 14:25:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-29 14:25:16 -0400 |
| commit | 62d3af1b5f3aa613e0a489e8d798d45b07f373f4 (patch) | |
| tree | 8f10dfd23c18600392965b69f94dd389e60827d5 /drivers/net/hamradio/mkiss.c | |
| parent | 942b6f62164cf8822dd03b1569777f4663d1abd7 (diff) | |
| parent | e71180f3689e00c5a1095925352a72dacdd62e34 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/hamradio/mkiss.c')
| -rw-r--r-- | drivers/net/hamradio/mkiss.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index 85d6dc005be0..3e9accf137e7 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c | |||
| @@ -390,10 +390,8 @@ static void ax_changedmtu(struct mkiss *ax) | |||
| 390 | "MTU change cancelled.\n", | 390 | "MTU change cancelled.\n", |
| 391 | ax->dev->name); | 391 | ax->dev->name); |
| 392 | dev->mtu = ax->mtu; | 392 | dev->mtu = ax->mtu; |
| 393 | if (xbuff != NULL) | 393 | kfree(xbuff); |
| 394 | kfree(xbuff); | 394 | kfree(rbuff); |
| 395 | if (rbuff != NULL) | ||
| 396 | kfree(rbuff); | ||
| 397 | return; | 395 | return; |
| 398 | } | 396 | } |
| 399 | 397 | ||