svn commit: r266435 - stable/8/sys/dev/uart

[Marius Strobl]

Author: marius
Date: Mon May 19 09:26:35 2014
New Revision: 266435
URL: http://svnweb.freebsd.org/changeset/base/266435

Log:
  MFC: r253654
  
  Set the device description after we call uart_probe(). In uart_probe()
  we call device-specific probe functions, which can (and typically will)
  set the device description based on low-level device probe information.
  In the end we never actually used the device description that we so
  carefully maintained in the PCI match table. By setting the device
  description after we call uart_probe(), we'll print the more user-
  friendly description by default.

Modified:
  stable/8/sys/dev/uart/uart_bus_pci.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/dev/   (props changed)
  stable/8/sys/dev/uart/   (props changed)

Modified: stable/8/sys/dev/uart/uart_bus_pci.c
==============================================================================
--- stable/8/sys/dev/uart/uart_bus_pci.c	Mon May 19 09:26:32 2014	(r266434)
+++ stable/8/sys/dev/uart/uart_bus_pci.c	Mon May 19 09:26:35 2014	(r266435)
@@ -164,6 +164,7 @@ uart_pci_probe(device_t dev)
 {
 	struct uart_softc *sc;
 	const struct pci_id *id;
+	int result;
 
 	sc = device_get_softc(dev);
 
@@ -176,9 +177,14 @@ uart_pci_probe(device_t dev)
 	return (ENXIO);
 
  match:
+	result = uart_bus_probe(dev, 0, id->rclk, id->rid, 0);
+	/* Bail out on error. */
+	if (result > 0)
+		return (result);
+	/* Set/override the device description. */
 	if (id->desc)
 		device_set_desc(dev, id->desc);
-	return (uart_bus_probe(dev, 0, id->rclk, id->rid, 0));
+	return (result);
 }
 
 DRIVER_MODULE(uart, pci, uart_pci_driver, uart_devclass, NULL, NULL);