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
This commit is contained in:
commit
08a55c01b5
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user