diff options
| author | Ian Abbott | 2013-04-04 15:58:59 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-04-05 23:33:18 +0200 |
| commit | 74ece108f9e55e7967d24a61e30f43e3aceb4809 (patch) | |
| tree | fb421f41b3bb2971498d5902d7fc470f19602427 /drivers/staging | |
| parent | staging: comedi: replace __comedi_device_detach() (diff) | |
| download | kernel-qcow2-linux-74ece108f9e55e7967d24a61e30f43e3aceb4809.tar.gz kernel-qcow2-linux-74ece108f9e55e7967d24a61e30f43e3aceb4809.tar.xz kernel-qcow2-linux-74ece108f9e55e7967d24a61e30f43e3aceb4809.zip | |
staging: comedi: move detach out of post-config
`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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/comedi/drivers.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index cf1ca822a2ce..fe2ad91f5aab 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c @@ -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) |