From owner-svn-src-all@FreeBSD.ORG  Sat Jul 10 22:37:23 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D5DB7106566C;
	Sat, 10 Jul 2010 22:37:23 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C54078FC17;
	Sat, 10 Jul 2010 22:37:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6AMbNJH088257;
	Sat, 10 Jul 2010 22:37:23 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6AMbNI7088255;
	Sat, 10 Jul 2010 22:37:23 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <201007102237.o6AMbNI7088255@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Sat, 10 Jul 2010 22:37:23 +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: r209892 - head/sys/dev/bwi
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 10 Jul 2010 22:37:23 -0000

Author: weongyo
Date: Sat Jul 10 22:37:23 2010
New Revision: 209892
URL: http://svn.freebsd.org/changeset/base/209892

Log:
  Fixes a page fault in bwi_pci_probe() because the array isn't terminated
  with NULL.
  
  PR:		kern/148473
  Submitted by:	Grzegorz Dabrowski <grzegorz.dabrowski at gmail dot com>
  MFC after:	1 week

Modified:
  head/sys/dev/bwi/if_bwi_pci.c

Modified: head/sys/dev/bwi/if_bwi_pci.c
==============================================================================
--- head/sys/dev/bwi/if_bwi_pci.c	Sat Jul 10 22:29:05 2010	(r209891)
+++ head/sys/dev/bwi/if_bwi_pci.c	Sat Jul 10 22:37:23 2010	(r209892)
@@ -91,7 +91,8 @@ static const struct bwi_dev {
 	{ PCI_VENDOR_BROADCOM, 0x4324,"Broadcom BCM4309 802.11a/b/g Wireless Lan" },
 	{ PCI_VENDOR_BROADCOM, 0x4318,"Broadcom BCM4318 802.11b/g Wireless Lan" },
 	{ PCI_VENDOR_BROADCOM, 0x4319,"Broadcom BCM4318 802.11a/b/g Wireless Lan" },
-	{ PCI_VENDOR_BROADCOM, 0x431a,"Broadcom BCM4318 802.11a Wireless Lan" }
+	{ PCI_VENDOR_BROADCOM, 0x431a,"Broadcom BCM4318 802.11a Wireless Lan" },
+	{ 0, 0, NULL }
 };
 
 static int