mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 14:19:16 +00:00
Code Issues Releases Wiki Activity

staging: comedi: move detach out of post-config

Browse source 
`comedi_device_postconfig()` calls `comedi_device_detach()` on failure.
Remove that call and make the callers of `comedi_device_postconfig()`
call `comedi_device_detach()` themselves if it returns an error.  This
seems more logical as the callers of `comedi_device_postconfig()` called
`comedi_device_detach()` anyway if they didn't call
`comedi_device_postconfig()`.

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>
This commit is contained in:
Ian Abbott 2013-04-04 14:58:59 +01:00 committed by Greg Kroah-Hartman
parent 016599f589
commit 74ece108f9
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/staging/comedi/drivers.c
View file

@ -273,7 +273,6 @@ static int comedi_device_postconfig(struct comedi_device *dev)
ret = __comedi_device_postconfig(dev);
if (ret < 0) {
comedi_device_detach(dev);
return ret;
}
if (!dev->board_name) {
@ -385,14 +384,12 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
* comedi_error() can be called from attach */
dev->driver = driv;
ret = driv->attach(dev, it);
if (ret >= 0)
ret = comedi_device_postconfig(dev);
if (ret < 0) {
comedi_device_detach(dev);
module_put(dev->driver->module);
return ret;
}
ret = comedi_device_postconfig(dev);
if (ret < 0)
module_put(dev->driver->module);
/* On success, the driver module count has been incremented. */
return ret;
}
@ -428,10 +425,10 @@ int comedi_auto_config(struct device *hardware_device,
comedi_set_hw_dev(comedi_dev, hardware_device);
comedi_dev->driver = driver;
ret = driver->auto_attach(comedi_dev, context);
if (ret >= 0)
ret = comedi_device_postconfig(comedi_dev);
if (ret < 0)
comedi_device_detach(comedi_dev);
else
ret = comedi_device_postconfig(comedi_dev);
mutex_unlock(&comedi_dev->mutex);
if (ret < 0)