diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 73727a73bd34..6f232b8128c0 100644
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -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);