svn commit: r210995 - projects/ofed/head/sys/ofed/include/linux

[Jeff Roberson]

Author: jeff
Date: Sat Aug  7 06:39:04 2010
New Revision: 210995
URL: http://svn.freebsd.org/changeset/base/210995

Log:
   - Only allow probe to attach when the driver matches the correct linux
     driver.  This keeps the device descriptions and unit numbers
     distinct.
  
  Sponsored by:	Isilon Systems, iX Systems, and Panasas.

Modified:
  projects/ofed/head/sys/ofed/include/linux/pci.h

Modified: projects/ofed/head/sys/ofed/include/linux/pci.h
==============================================================================
--- projects/ofed/head/sys/ofed/include/linux/pci.h	Sat Aug  7 05:46:04 2010	(r210994)
+++ projects/ofed/head/sys/ofed/include/linux/pci.h	Sat Aug  7 06:39:04 2010	(r210995)
@@ -358,6 +358,8 @@ linux_pci_probe(device_t dev)
 
 	if ((pdrv = linux_pci_find(dev, &id)) == NULL)
 		return (ENXIO);
+	if (device_get_driver(dev) != &pdrv->driver)
+		return (ENXIO);
 	device_set_desc(dev, pdrv->name);
 	return (0);
 }