diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
| commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
| tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /drivers/net/via-velocity.c | |
| parent | 5615ca7906aefbdc3318604c89db5931d0a25910 (diff) | |
| parent | be15cd72d256e5eb3261a781b8507fac83ab33f6 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/via-velocity.c')
| -rw-r--r-- | drivers/net/via-velocity.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index abc5cee6eedc..a368d08e7d19 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c | |||
| @@ -1212,10 +1212,8 @@ static void velocity_free_td_ring(struct velocity_info *vptr) | |||
| 1212 | velocity_free_td_ring_entry(vptr, j, i); | 1212 | velocity_free_td_ring_entry(vptr, j, i); |
| 1213 | 1213 | ||
| 1214 | } | 1214 | } |
| 1215 | if (vptr->td_infos[j]) { | 1215 | kfree(vptr->td_infos[j]); |
| 1216 | kfree(vptr->td_infos[j]); | 1216 | vptr->td_infos[j] = NULL; |
| 1217 | vptr->td_infos[j] = NULL; | ||
| 1218 | } | ||
| 1219 | } | 1217 | } |
| 1220 | } | 1218 | } |
| 1221 | 1219 | ||