diff --git a/[refs] b/[refs]
index 04c353047b43..5769b1127486 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b725aaedd687361e3fdd8e61d3af24482557e3c
+refs/heads/master: de46fb7776da0565fa71cb407c7eb45ce87676b9
diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c
index f1754ee7ab24..a9b38dd122f6 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -185,12 +185,6 @@ static void dio24_detach(struct comedi_device *dev)
 };
 
 static void dio24_config(struct pcmcia_device *link);
-static void dio24_release(struct pcmcia_device *link);
-static int dio24_cs_suspend(struct pcmcia_device *p_dev);
-static int dio24_cs_resume(struct pcmcia_device *p_dev);
-
-static int dio24_cs_attach(struct pcmcia_device *);
-static void dio24_cs_detach(struct pcmcia_device *);
 
 struct local_info_t {
 	struct pcmcia_device *link;
@@ -223,7 +217,7 @@ static int dio24_cs_attach(struct pcmcia_device *link)
 static void dio24_cs_detach(struct pcmcia_device *link)
 {
 	((struct local_info_t *)link->priv)->stop = 1;
-	dio24_release(link);
+	pcmcia_disable_device(link);
 
 	/* This points to the parent local_info_t struct */
 	kfree(link->priv);
@@ -266,16 +260,8 @@ static void dio24_config(struct pcmcia_device *link)
 
 failed:
 	dev_info(&link->dev, "Fallo");
-	dio24_release(link);
-
-}				/* dio24_config */
-
-static void dio24_release(struct pcmcia_device *link)
-{
-	dev_dbg(&link->dev, "dio24_release\n");
-
 	pcmcia_disable_device(link);
-}				/* dio24_release */
+}
 
 static int dio24_cs_suspend(struct pcmcia_device *link)
 {