USB: cp2101 device

[linux-2.6-omap-h63xx.git] / drivers / usb / storage / libusual.c

diff --git a/drivers/usb/storage/libusual.c b/drivers/usb/storage/libusual.c
index 55b952084f0c07d065546526ea870ca27d869f3e..f970b27ba3083ef6cbd4ae62a477caab6d74eae8 100644 (file)
--- a/drivers/usb/storage/libusual.c
+++ b/drivers/usb/storage/libusual.c
@@ -9,6 +9,7 @@
 #include <linux/usb_usual.h>
 #include <linux/vmalloc.h>
 #include <linux/kthread.h>
+#include <linux/mutex.h>
 
 /*
  */
@@ -30,7 +31,7 @@ static atomic_t usu_bias = ATOMIC_INIT(USB_US_DEFAULT_BIAS);
 #define BIAS_NAME_SIZE  (sizeof("usb-storage"))
 static const char *bias_names[3] = { "none", "usb-storage", "ub" };
 
-static struct semaphore usu_init_notify;
+static DEFINE_MUTEX(usu_probe_mutex);
 static DECLARE_COMPLETION(usu_end_notify);
 static atomic_t total_threads = ATOMIC_INIT(0);
 
@@ -45,6 +46,12 @@ static int usu_probe_thread(void *arg);
 { USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin,bcdDeviceMax), \
   .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
 
+#define COMPLIANT_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \
+                   vendorName, productName, useProtocol, useTransport, \
+                   initFunction, flags) \
+{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
+  .driver_info = (flags) }
+
 #define USUAL_DEV(useProto, useTrans, useType) \
 { USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans), \
   .driver_info = ((useType)<<24) }
@@ -56,6 +63,7 @@ struct usb_device_id storage_usb_ids [] = {
 
 #undef USUAL_DEV
 #undef UNUSUAL_DEV
+#undef COMPLIANT_DEV
 
 MODULE_DEVICE_TABLE(usb, storage_usb_ids);
 EXPORT_SYMBOL_GPL(storage_usb_ids);
@@ -134,7 +142,7 @@ static int usu_probe(struct usb_interface *intf,
        stat[type].fls |= USU_MOD_FL_THREAD;
        spin_unlock_irqrestore(&usu_lock, flags);
 
-       task = kthread_run(usu_probe_thread, (void*)type, "libusual_%d", type);
+       task = kthread_run(usu_probe_thread, (void*)type, "libusual_%ld", type);
        if (IS_ERR(task)) {
                rc = PTR_ERR(task);
                printk(KERN_WARNING "libusual: "
@@ -178,10 +186,7 @@ static int usu_probe_thread(void *arg)
        int rc;
        unsigned long flags;
 
-       /* A completion does not work here because it's counted. */
-       down(&usu_init_notify);
-       up(&usu_init_notify);
-
+       mutex_lock(&usu_probe_mutex);
        rc = request_module(bias_names[type]);
        spin_lock_irqsave(&usu_lock, flags);
        if (rc == 0 && (st->fls & USU_MOD_FL_PRESENT) == 0) {
@@ -194,6 +199,7 @@ static int usu_probe_thread(void *arg)
        }
        st->fls &= ~USU_MOD_FL_THREAD;
        spin_unlock_irqrestore(&usu_lock, flags);
+       mutex_unlock(&usu_probe_mutex);
 
        complete_and_exit(&usu_end_notify, 0);
 }
@@ -204,10 +210,9 @@ static int __init usb_usual_init(void)
 {
        int rc;
 
-       sema_init(&usu_init_notify, 0);
-
+       mutex_lock(&usu_probe_mutex);
        rc = usb_register(&usu_driver);
-       up(&usu_init_notify);
+       mutex_unlock(&usu_probe_mutex);
        return rc;
 }