USB

cleaned up checking the return value of usb_register_dev()

diff --git a/drivers/usb/class/printer.c b/drivers/usb/class/printer.c
index 150574d36a3e50f2813d5a8ac50bf1c9de3d80b1..73a1b11a639ad5d62ec7b8443890afe115bd3cc0 100644 (file)
--- a/drivers/usb/class/printer.c
+++ b/drivers/usb/class/printer.c
@@ -794,6 +794,7 @@ static void *usblp_probe(struct usb_device *dev, unsigned int ifnum,
 {
        struct usblp *usblp = 0;
        int protocol;
+       int retval;
        char name[6];
 
        /* Malloc and start initializing usblp structure so we can use it
@@ -808,7 +809,12 @@ static void *usblp_probe(struct usb_device *dev, unsigned int ifnum,
        init_waitqueue_head(&usblp->wait);
        usblp->ifnum = ifnum;
 
-       if (usb_register_dev(&usblp_driver, 1, &usblp->minor)) {
+       retval = usb_register_dev(&usblp_driver, 1, &usblp->minor);
+       if (retval) {
+               if (retval != -ENODEV) {
+                       err("Not able to get a minor for this device.");
+                       goto abort;
+               }
                /* Look for a free usblp_table entry on our own. */
                while (usblp_table[usblp->minor]) {
                        usblp->minor++;

diff --git a/drivers/usb/image/mdc800.c b/drivers/usb/image/mdc800.c
index c211b9980c8089758c3402453534e4f3a0305166..a4cccb7e4df765294a4b38977c79ce1b75eacc54 100644 (file)
--- a/drivers/usb/image/mdc800.c
+++ b/drivers/usb/image/mdc800.c
@@ -411,6 +411,7 @@ static void* mdc800_usb_probe (struct usb_device *dev ,unsigned int ifnum,
        int i,j;
        struct usb_interface_descriptor *intf_desc;
        int irq_interval=0;
+       int retval;
 
        dbg ("(mdc800_usb_probe) called.");
 
@@ -475,7 +476,11 @@ static void* mdc800_usb_probe (struct usb_device *dev ,unsigned int ifnum,
 
        down (&mdc800->io_lock);
 
-       usb_register_dev (&mdc800_usb_driver, 1, &mdc800->minor);
+       retval = usb_register_dev (&mdc800_usb_driver, 1, &mdc800->minor);
+       if (retval && (retval != -ENODEV)) {
+               err ("Not able to get a minor for this device.");
+               return 0;
+       }
 
        mdc800->dev=dev;
        mdc800->open=0;

diff --git a/drivers/usb/image/scanner.c b/drivers/usb/image/scanner.c
index d26c0d17635e77e3fcc5700e6ff4502d1e29cba2..8c1ac19386d42cd29647edaba5e12a432e056697 100644 (file)
--- a/drivers/usb/image/scanner.c
+++ b/drivers/usb/image/scanner.c
@@ -812,6 +812,7 @@ probe_scanner(struct usb_device *dev, unsigned int ifnum,
        int ep_cnt;
        int ix;
        int scn_minor;
+       int retval;
 
        char valid_device = 0;
        char have_bulk_in, have_bulk_out, have_intr;
@@ -953,7 +954,13 @@ probe_scanner(struct usb_device *dev, unsigned int ifnum,
        
        down(&scn_mutex);
 
-       if (usb_register_dev(&scanner_driver, 1, &scn_minor)) {
+       retval = usb_register_dev(&scanner_driver, 1, &scn_minor);
+       if (retval) {
+               if (retval != -ENODEV) {
+                       err ("Not able to get a minor for this device.");
+                       up(&scn_mutex);
+                       return NULL;
+               }
                for (scn_minor = 0; scn_minor < SCN_MAX_MNR; scn_minor++) {
                        if (!p_scn_table[scn_minor])
                                break;

diff --git a/drivers/usb/input/hiddev.c b/drivers/usb/input/hiddev.c
index 271ee088571e9db0b64874e83b8c3224d0e4730a..88f0d76c8c7a4bac01bf342fb19d1c55a52c7b9a 100644 (file)
--- a/drivers/usb/input/hiddev.c
+++ b/drivers/usb/input/hiddev.c
@@ -606,6 +606,7 @@ int hiddev_connect(struct hid_device *hid)
 {
        struct hiddev *hiddev;
        int minor, i;
+       int retval;
        char devfs_name[16];
 
        for (i = 0; i < hid->maxapplication; i++)
@@ -615,7 +616,12 @@ int hiddev_connect(struct hid_device *hid)
        if (i == hid->maxapplication)
                return -1;
 
-       if (usb_register_dev (&hiddev_driver, 1, &minor)) {
+       retval = usb_register_dev (&hiddev_driver, 1, &minor);
+       if (retval) {
+               if (retval != -ENODEV) {
+                       err ("Not able to get a minor for this device.");
+                       return -1;
+               }
                for (minor = 0; minor < HIDDEV_MINORS && hiddev_table[minor]; minor++);
                if (minor == HIDDEV_MINORS) {
                        printk(KERN_ERR "hiddev: no more free hiddev devices\n");

diff --git a/drivers/usb/media/dabusb.c b/drivers/usb/media/dabusb.c
index 30dfc3930cc620b302fd7049950f6bd4c3ea7d0d..0939bd74c2c8600184f983291d37c2b5fc1bfb6c 100644 (file)
--- a/drivers/usb/media/dabusb.c
+++ b/drivers/usb/media/dabusb.c
@@ -727,6 +727,7 @@ static void *dabusb_probe (struct usb_device *usbdev, unsigned int ifnum,
                           const struct usb_device_id *id)
 {
        int devnum;
+       int retval;
        pdabusb_t s;
 
        dbg("dabusb: probe: vendor id 0x%x, device id 0x%x ifnum:%d",
@@ -739,7 +740,10 @@ static void *dabusb_probe (struct usb_device *usbdev, unsigned int ifnum,
        if (ifnum != _DABUSB_IF && usbdev->descriptor.idProduct == 0x9999)
                return NULL;
 
-       if (usb_register_dev (&dabusb_driver, 1, &devnum)) {
+       retval = usb_register_dev (&dabusb_driver, 1, &devnum);
+       if (retval) {
+               if (retval != -ENODEV)
+                       return NULL;
                devnum = dabusb_find_struct ();
                if (devnum == -1)
                        return NULL;

diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c
index 579f6ab2f9efef27930db3028bcb401218a9fcc2..1a6f086298e601191f60348ff8bc86bdb9ffdf86 100644 (file)
--- a/drivers/usb/misc/auerswald.c
+++ b/drivers/usb/misc/auerswald.c
@@ -1948,7 +1948,13 @@ static void *auerswald_probe (struct usb_device *usbdev, unsigned int ifnum,
        init_waitqueue_head (&cp->bufferwait);
 
        down (&dev_table_mutex);
-       if (usb_register_dev (&auerswald_driver, 1, &dtindex)) {
+       ret = usb_register_dev (&auerswald_driver, 1, &dtindex);
+       if (ret) {
+               if (ret != -ENODEV) {
+                       err ("Not able to get a minor for this device.");
+                       up (&dev_table_mutex);
+                       goto pfail;
+               }
                /* find a free slot in the device table */
                for (dtindex = 0; dtindex < AUER_MAX_DEVICES; ++dtindex) {
                        if (dev_table[dtindex] == NULL)

diff --git a/drivers/usb/misc/brlvger.c b/drivers/usb/misc/brlvger.c
index e77d0a1e466ad969103db3bdd60c9ca9a4c68347..7792f1c86ec5b9068546690099384b7ae2e1c13e 100644 (file)
--- a/drivers/usb/misc/brlvger.c
+++ b/drivers/usb/misc/brlvger.c
@@ -290,6 +290,7 @@ brlvger_probe (struct usb_device *dev, unsigned ifnum,
 {
        struct brlvger_priv *priv = NULL;
        int i;
+       int retval;
        struct usb_endpoint_descriptor *endpoint;
        struct usb_interface_descriptor *actifsettings;
        /* protects against reentrance: once we've found a free slot
@@ -315,7 +316,12 @@ brlvger_probe (struct usb_device *dev, unsigned ifnum,
 
        down(&reserve_sem);
 
-       if (usb_register_dev(&brlvger_driver, 1, &i)) {
+       retval = usb_register_dev(&brlvger_driver, 1, &i);
+       if (retval) {
+               if (retval != -ENODEV) {
+                       err("Not able to get a minor for this device.");
+                       goto error;
+               }
                for( i = 0; i < MAX_NR_BRLVGER_DEVS; i++ )
                        if( display_table[i] == NULL )
                                break;

diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index 1d7c06b833ff94357d586a39004a9ddcc9bf3273..d89a497ad8716d317d9069655a2afc6a3970da3f 100644 (file)
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -525,6 +525,7 @@ static void * skel_probe(struct usb_device *udev, unsigned int ifnum, const stru
        int minor;
        int buffer_size;
        int i;
+       int retval;
        char name[10];
 
        
@@ -535,14 +536,20 @@ static void * skel_probe(struct usb_device *udev, unsigned int ifnum, const stru
        }
 
        down (&minor_table_mutex);
-       if (usb_register_dev (&skel_driver, 1, &minor)) {
+       retval = usb_register_dev (&skel_driver, 1, &minor);
+       if (retval) {
+               if (retval != -ENODEV) {
+                       /* something prevented us from registering this driver */
+                       err ("Not able to get a minor for this device.");
+                       goto exit;
+               }
                /* we could not get a dynamic minor, so lets find one of our own */
                for (minor = 0; minor < MAX_DEVICES; ++minor) {
                        if (minor_table[minor] == NULL)
                                break;
                }
                if (minor >= MAX_DEVICES) {
-                       info ("Too many devices plugged in, can not handle this device.");
+                       err ("Too many devices plugged in, can not handle this device.");
                        goto exit;
                }
        }