diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-11 09:14:17 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-11 09:14:17 -0400 |
| commit | 6b12a3d35ff6cb09f8b777ab258ea1e32c680d62 (patch) | |
| tree | 433a88c55ac4713e9d839a9589728ac4dd142afd /drivers | |
| parent | 0486a8c83b0f83c52c4d93accd841e08ccdf04dc (diff) | |
| parent | 519854876c66bd04b0c12d3cead6e0e5fc5a1167 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/dm9000.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index 3d76fa144c4..a860ebbbf81 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c @@ -377,8 +377,8 @@ dm9000_release_board(struct platform_device *pdev, struct board_info *db) kfree(db->data_req); } - if (db->addr_res != NULL) { - release_resource(db->addr_res); + if (db->addr_req != NULL) { + release_resource(db->addr_req); kfree(db->addr_req); } } |