linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / pnp / driver.c

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index e161423..7cafacd 100644 (file)
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -5,6 +5,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <linux/string.h>
 #include <linux/list.h>
 #include <linux/module.h>
@@ -200,14 +201,31 @@ struct bus_type pnp_bus_type = {
        .resume = pnp_bus_resume,
 };
 
+
+static int count_devices(struct device * dev, void * c)
+{
+       int * count = c;
+       (*count)++;
+       return 0;
+}
+
 int pnp_register_driver(struct pnp_driver *drv)
 {
+       int count;
+
        pnp_dbg("the driver '%s' has been registered", drv->name);
 
        drv->driver.name = drv->name;
        drv->driver.bus = &pnp_bus_type;
 
-       return driver_register(&drv->driver);
+       count = driver_register(&drv->driver);
+
+       /* get the number of initial matches */
+       if (count >= 0){
+               count = 0;
+               driver_for_each_device(&drv->driver, NULL, &count, count_devices);
+       }
+       return count;
 }
 
 void pnp_unregister_driver(struct pnp_driver *drv)