From 74ece108f9e55e7967d24a61e30f43e3aceb4809 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Thu, 4 Apr 2013 14:58:59 +0100 Subject: [PATCH] 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 Reviewed-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index cf1ca82..fe2ad91 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) -- 2.7.4