From owner-cvs-src-old@FreeBSD.ORG  Mon Jun  6 13:21:22 2011
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0AA4E1065670
	for <cvs-src-old@freebsd.org>; Mon,  6 Jun 2011 13:21:22 +0000 (UTC)
	(envelope-from jhb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ED3218FC15
	for <cvs-src-old@freebsd.org>; Mon,  6 Jun 2011 13:21:21 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p56DLLDO064506
	for <cvs-src-old@freebsd.org>; Mon, 6 Jun 2011 13:21:21 GMT
	(envelope-from jhb@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p56DLLM8064505
	for cvs-src-old@freebsd.org; Mon, 6 Jun 2011 13:21:21 GMT
	(envelope-from jhb@repoman.freebsd.org)
Message-Id: <201106061321.p56DLLM8064505@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	jhb@repoman.freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Mon, 6 Jun 2011 13:21:11 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/dev/cardbus cardbus_cis.c src/sys/dev/pci pci.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Jun 2011 13:21:22 -0000

jhb         2011-06-06 13:21:11 UTC

  FreeBSD src repository

  Modified files:
    sys/dev/cardbus      cardbus_cis.c 
    sys/dev/pci          pci.c 
  Log:
  SVN rev 222753 on 2011-06-06 13:21:11Z by jhb
  
  More properly handle Cardbus cards that that store their CIS in a BAR after
  the recent changes to track BAR state explicitly.  The code would now
  attempt to add the same BAR twice in this case.  Instead, change this so
  that it recognizes this case and only adds it once and do not delete the
  BAR outright after parsing the CIS.
  
  Tested by:      bschmidt
  
  Revision  Changes    Path
  1.71      +2 -3      src/sys/dev/cardbus/cardbus_cis.c
  1.421     +11 -0     src/sys/dev/pci/pci.c