From: Jeff Garzik Subject: [git patch] net driver fix Date: Mon, 11 Sep 2006 09:15:28 -0400 Message-ID: <20060911131528.GA5059@havoc.gtf.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Return-path: Received: from havoc.gtf.org ([69.61.125.42]:64899 "EHLO havoc.gtf.org") by vger.kernel.org with ESMTP id S1751475AbWIKNP3 (ORCPT ); Mon, 11 Sep 2006 09:15:29 -0400 To: Andrew Morton , Linus Torvalds Content-Disposition: inline Sender: netdev-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream-linus to receive the following updates: drivers/net/dm9000.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Dirk Opfer: Fix dm9000 release_resource diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index 3d76fa1..a860ebb 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c @@ -377,8 +377,8 @@ dm9000_release_board(struct platform_dev 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); } }