From owner-svn-src-head@FreeBSD.ORG  Tue Jan  3 18:40:42 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0F54D106566C;
	Tue,  3 Jan 2012 18:40:42 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F2A448FC08;
	Tue,  3 Jan 2012 18:40:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q03IefBd036491;
	Tue, 3 Jan 2012 18:40:41 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q03Iefc5036489;
	Tue, 3 Jan 2012 18:40:41 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201201031840.q03Iefc5036489@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 3 Jan 2012 18:40:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229401 - head/sys/dev/if_ndis
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jan 2012 18:40:42 -0000

Author: dim
Date: Tue Jan  3 18:40:41 2012
New Revision: 229401
URL: http://svn.freebsd.org/changeset/base/229401

Log:
  In sys/dev/if_ndis/if_ndis_pccard.c, fix a bug where a garbage rid was
  passed to resource_list_add().  The rid that was just returned by
  bus_alloc_resource_any() should have been used instead.
  
  Reviewed by:	jhb
  MFC after:	1 week

Modified:
  head/sys/dev/if_ndis/if_ndis_pccard.c

Modified: head/sys/dev/if_ndis/if_ndis_pccard.c
==============================================================================
--- head/sys/dev/if_ndis/if_ndis_pccard.c	Tue Jan  3 17:31:27 2012	(r229400)
+++ head/sys/dev/if_ndis/if_ndis_pccard.c	Tue Jan  3 18:40:41 2012	(r229401)
@@ -207,7 +207,7 @@ ndis_attach_pccard(dev)
 		goto fail;
 	}
 	sc->ndis_rescnt++;
-	resource_list_add(&sc->ndis_rl, SYS_RES_IOPORT, rid,
+	resource_list_add(&sc->ndis_rl, SYS_RES_IOPORT, sc->ndis_io_rid,
 	    rman_get_start(sc->ndis_res_io), rman_get_end(sc->ndis_res_io),
 	    rman_get_size(sc->ndis_res_io));