Merge remote-tracking branch 'remotes/tegra/android-tegra-2.6.36-honeycomb-mr1' into...

[firefly-linux-kernel-4.4.55.git] / drivers / base / bus.c

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index eb1b7fa20dce5af66c6711d05e97642ce4c568a1..96709f26d70fc4ab499ffb39fbe52cd2e4a25362 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -18,6 +18,8 @@
 #include <linux/string.h>
 #include "base.h"
 #include "power/power.h"
+#include "linux/usb.h"
+#include "devices_filter.h"
 
 #define to_bus_attr(_attr) container_of(_attr, struct bus_attribute, attr)
 #define to_bus(obj) container_of(obj, struct bus_type_private, subsys.kobj)
@@ -405,7 +407,20 @@ int bus_for_each_drv(struct bus_type *bus, struct device_driver *start,
        klist_iter_init_node(&bus->p->klist_drivers, &i,
                             start ? &start->p->knode_bus : NULL);
        while ((drv = next_driver(&i)) && !error)
+       {
+               if( !strcmp(drv->name, "usb-storage") && data )
+               {
+                       struct usb_device *udev = interface_to_usbdev( to_usb_interface( (struct device *)data) );
+                       usb_parameter usbp = {udev->descriptor.idVendor, udev->descriptor.idProduct, 
+                                       udev->manufacturer, udev->product, NULL};
+                       if( is_skip_device(&usbp) )
+                       {
+                               printk("Skip device\n");
+                               continue;
+                       }
+               }
                error = fn(drv, data);
+        }
        klist_iter_exit(&i);
        return error;
 }
@@ -674,7 +689,10 @@ int bus_add_driver(struct device_driver *drv)
        if (drv->bus->p->drivers_autoprobe) {
                error = driver_attach(drv);
                if (error)
+               {
+                       printk(KERN_ERR "driver_attach failed\n");
                        goto out_unregister;
+               }
        }
        klist_add_tail(&priv->knode_bus, &bus->p->klist_drivers);
        module_add_driver(drv->owner, drv);