diff --git a/[refs] b/[refs]
index 19715acedc56..fd81f9b99673 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 468777024e3f635c78cc7b0370f447978669431d
+refs/heads/master: 36061c842be56f62bf77d7339bc4581a38e03846
diff --git a/trunk/drivers/staging/comedi/drivers/das08_cs.c b/trunk/drivers/staging/comedi/drivers/das08_cs.c
index 14dfc81d78c6..493078a26a7a 100644
--- a/trunk/drivers/staging/comedi/drivers/das08_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/das08_cs.c
@@ -239,11 +239,18 @@ static int __init das08_cs_init_module(void)
 {
 	int ret;
 
-	ret = pcmcia_register_driver(&das08_cs_driver);
+	ret = comedi_driver_register(&driver_das08_cs);
 	if (ret < 0)
 		return ret;
 
-	return comedi_driver_register(&driver_das08_cs);
+	ret = pcmcia_register_driver(&das08_cs_driver);
+	if (ret < 0) {
+		comedi_driver_unregister(&driver_das08_cs);
+		return ret;
+	}
+
+	return 0;
+
 }
 module_init(das08_cs_init_module);