From owner-svn-src-stable@FreeBSD.ORG  Tue Jan 10 07:38:46 2012
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EAC6E1065670;
	Tue, 10 Jan 2012 07:38:46 +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 D4A2E8FC0A;
	Tue, 10 Jan 2012 07:38:46 +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 q0A7ckC9095964;
	Tue, 10 Jan 2012 07:38:46 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0A7ck1R095962;
	Tue, 10 Jan 2012 07:38:46 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201201100738.q0A7ck1R095962@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 10 Jan 2012 07:38:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229922 - stable/9/sys/dev/if_ndis
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Jan 2012 07:38:47 -0000

Author: dim
Date: Tue Jan 10 07:38:46 2012
New Revision: 229922
URL: http://svn.freebsd.org/changeset/base/229922

Log:
  MFC r229401:
  
  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

Modified:
  stable/9/sys/dev/if_ndis/if_ndis_pccard.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/if_ndis/if_ndis_pccard.c
==============================================================================
--- stable/9/sys/dev/if_ndis/if_ndis_pccard.c	Tue Jan 10 07:21:11 2012	(r229921)
+++ stable/9/sys/dev/if_ndis/if_ndis_pccard.c	Tue Jan 10 07:38:46 2012	(r229922)
@@ -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));