]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: comedi: usbdux: remove unnecessary tidy_up() calls
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Wed, 24 Jul 2013 21:08:43 +0000 (14:08 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Jul 2013 20:15:25 +0000 (13:15 -0700)
If the comedi_driver (*auto_attach) fails, the comedi core will call
the (*detach) function to do any cleanup. It's not necessary to do
the cleanup in the (*auto_attach).

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/comedi/drivers/usbdux.c

index 8102efbced79061262074a8746842dffa26972a8..6a7d7f4aabec8a0c69318f5ff13836f9d8d4b4a0 100644 (file)
@@ -2294,17 +2294,14 @@ static int usbdux_auto_attach(struct comedi_device *dev,
        }
 
        ret = usbdux_alloc_usb_buffers(devpriv);
-       if (ret) {
-               tidy_up(devpriv);
+       if (ret)
                return ret;
-       }
 
        /* setting to alternate setting 3: enabling iso ep and bulk ep. */
        ret = usb_set_interface(devpriv->usbdev, devpriv->ifnum, 3);
        if (ret < 0) {
                dev_err(dev->class_dev,
                        "could not set alternate setting 3 in high speed\n");
-               tidy_up(devpriv);
                return ret;
        }