diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-11 10:54:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-11 10:54:45 -0400 |
| commit | 08a55c01b504360d48b8123c87b383f7e6a2ef21 (patch) | |
| tree | 33d8591741486a959b6130a5c8b73382db16cbe1 /drivers | |
| parent | 3f2f1257ff6327e330d9e4f0ba1a48a73b0044dc (diff) | |
| parent | 519854876c66bd04b0c12d3cead6e0e5fc5a1167 (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
[PATCH] Fix dm9000 release_resource
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 3d76fa144c4f..a860ebbbf815 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) | |||
| 377 | kfree(db->data_req); | 377 | kfree(db->data_req); |
| 378 | } | 378 | } |
| 379 | 379 | ||
| 380 | if (db->addr_res != NULL) { | 380 | if (db->addr_req != NULL) { |
| 381 | release_resource(db->addr_res); | 381 | release_resource(db->addr_req); |
| 382 | kfree(db->addr_req); | 382 | kfree(db->addr_req); |
| 383 | } | 383 | } |
| 384 | } | 384 | } |