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/rrunner.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/rrunner.c')
| -rw-r--r-- | drivers/net/rrunner.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c index ec1a18d189a1..19c2df9c86fe 100644 --- a/drivers/net/rrunner.c +++ b/drivers/net/rrunner.c | |||
| @@ -1710,10 +1710,8 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) | |||
| 1710 | error = -EFAULT; | 1710 | error = -EFAULT; |
| 1711 | } | 1711 | } |
| 1712 | wf_out: | 1712 | wf_out: |
| 1713 | if (oldimage) | 1713 | kfree(oldimage); |
| 1714 | kfree(oldimage); | 1714 | kfree(image); |
| 1715 | if (image) | ||
| 1716 | kfree(image); | ||
| 1717 | return error; | 1715 | return error; |
| 1718 | 1716 | ||
| 1719 | case SIOCRRID: | 1717 | case SIOCRRID: |