From owner-svn-src-head@FreeBSD.ORG  Sun Dec 28 21:36:21 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 492B5E7F;
 Sun, 28 Dec 2014 21:36:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 35E60198D;
 Sun, 28 Dec 2014 21:36:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBSLaLOW091891;
 Sun, 28 Dec 2014 21:36:21 GMT (envelope-from marius@FreeBSD.org)
Received: (from marius@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBSLaLg7091890;
 Sun, 28 Dec 2014 21:36:21 GMT (envelope-from marius@FreeBSD.org)
Message-Id: <201412282136.sBSLaLg7091890@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: marius set sender to
 marius@FreeBSD.org using -f
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 28 Dec 2014 21:36:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r276351 - head/sys/dev/uart
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Sun, 28 Dec 2014 21:36:21 -0000

Author: marius
Date: Sun Dec 28 21:36:20 2014
New Revision: 276351
URL: https://svnweb.freebsd.org/changeset/base/276351

Log:
  Don't use a sub-device/-vendor wildcard for probing MCS9922 as other
  chips with the same device and vendor IDs actually may provide different
  functionality. While at it, canonicalize the description to match other
  MosChip UARTs.
  
  PR:		186891
  MFC after:	3 days

Modified:
  head/sys/dev/uart/uart_bus_pci.c

Modified: head/sys/dev/uart/uart_bus_pci.c
==============================================================================
--- head/sys/dev/uart/uart_bus_pci.c	Sun Dec 28 21:33:41 2014	(r276350)
+++ head/sys/dev/uart/uart_bus_pci.c	Sun Dec 28 21:36:20 2014	(r276351)
@@ -137,8 +137,8 @@ static const struct pci_id pci_ns8250_id
 	"MosChip MCS9901 PCIe to Peripheral Controller", 0x10 },
 { 0x9710, 0x9904, 0xa000, 0x1000,
 	"MosChip MCS9904 PCIe to Peripheral Controller", 0x10 },
-{ 0x9710, 0x9922, 0xffff, 0,
-	"MosChip MCS9922 Multi I/O Controller", 0x10 },
+{ 0x9710, 0x9922, 0xa000, 0x1000,
+	"MosChip MCS9922 PCIe to Peripheral Controller", 0x10 },
 { 0xdeaf, 0x9051, 0xffff, 0, "Middle Digital PC Weasel Serial Port", 0x10 },
 { 0xffff, 0, 0xffff, 0, NULL, 0, 0}
 };