diff options
| author |  Linus Torvalds <torvalds@g5.osdl.org>
| 2006-09-11 07:54:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org>
| 2006-09-11 07:54:45 -0700 |
| commit | 08a55c01b504360d48b8123c87b383f7e6a2ef21 (patch) | |
| tree | 33d8591741486a959b6130a5c8b73382db16cbe1 /drivers | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| parent | [PATCH] Fix dm9000 release_resource (diff) | |
| download | linux-08a55c01b504360d48b8123c87b383f7e6a2ef21.tar.gz linux-08a55c01b504360d48b8123c87b383f7e6a2ef21.tar.bz2 linux-08a55c01b504360d48b8123c87b383f7e6a2ef21.zip | |
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) 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); } } |