summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-11 07:54:45 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-11 07:54:45 -0700
commit08a55c01b504360d48b8123c87b383f7e6a2ef21 (patch)
tree33d8591741486a959b6130a5c8b73382db16cbe1
parent3f2f1257ff6327e330d9e4f0ba1a48a73b0044dc (diff)
parent519854876c66bd04b0c12d3cead6e0e5fc5a1167 (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
-rw-r--r--drivers/net/dm9000.c4
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);
}
}