Commit dcd7b8bd authored Apr 04, 2013 by Ian Abbott Committed by Greg Kroah-Hartman Apr 05, 2013

staging: comedi: put module _after_ detach



On failure of the call to the low-level comedi device driver's
`->attach()` handler from `__comedi_device_attach()`, reverse the
current ordering of the calls to `module_put()` and
`comedi_device_detach()` because `__comedi_device_detach()` will call
code in the module being put.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b2a644b4

drivers/staging/comedi/drivers.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -396,8 +396,8 @@ int comedi_device_attach(struct comedi_device dev, struct comedi_devconfig it)
		dev->driver = driv;
		ret = driv->attach(dev, it);
		if (ret < 0) {
		module_put(dev->driver->module);
		__comedi_device_detach(dev);
		module_put(dev->driver->module);
		return ret;
		}
		ret = comedi_device_postconfig(dev);