Commit 29d0c074 authored Jul 24, 2013 by H Hartley Sweeten Committed by Greg Kroah-Hartman Jul 25, 2013

staging: comedi: usbdux: remove unnecessary tidy_up() calls



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>

parent ef1ee8cf

drivers/staging/comedi/drivers/usbdux.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -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;
		}