Commit 08a55c01 authored by Linus Torvalds's avatar Linus Torvalds

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
parents 3f2f1257 51985487
...@@ -377,8 +377,8 @@ dm9000_release_board(struct platform_device *pdev, struct board_info *db) ...@@ -377,8 +377,8 @@ dm9000_release_board(struct platform_device *pdev, struct board_info *db)
kfree(db->data_req); kfree(db->data_req);
} }
if (db->addr_res != NULL) { if (db->addr_req != NULL) {
release_resource(db->addr_res); release_resource(db->addr_req);
kfree(db->addr_req); kfree(db->addr_req);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment