Merge branch 'upstream-fixes' into upstream

6b12a3d3 · Jeff Garzik · 0486a8c8 · 51985487 · 6b12a3d3
Commit 6b12a3d3 authored Sep 11, 2006 by Jeff Garzik
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

drivers/net/dm9000.c drivers/net/dm9000.c +2 -2

No files found.
--- 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) {
+	if (db->addr_req != NULL) {
-		release_resource(db->addr_res);
+		release_resource(db->addr_req);
 		kfree(db->addr_req);
 	}
 }