---

yaml --- r: 354230 b: refs/heads/master c: 86be568 h: refs/heads/master v: v3
git-mirror · Jan 30, 2013 · 34322bb · 34322bb
1 parent f8102bc
commit 34322bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d1db2a4134bb486b28f943baac175e3edcc51053
+refs/heads/master: 86be5680f5804690654519751ed77aaa54b01826
diff --git a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -936,13 +936,6 @@ static int daqp_cs_resume(struct pcmcia_device *link)
 	return 0;
 }
 
-static void daqp_cs_release(struct pcmcia_device *link)
-{
-	dev_dbg(&link->dev, "daqp_cs_release\n");
-
-	pcmcia_disable_device(link);
-}
-
 static int daqp_pcmcia_config_loop(struct pcmcia_device *p_dev, void *priv_data)
 {
 	if (p_dev->config_index == 0)
@@ -976,7 +969,7 @@ static void daqp_cs_config(struct pcmcia_device *link)
 	return;
 
 failed:
-	daqp_cs_release(link);
+	pcmcia_disable_device(link);
 }
 
 static int daqp_cs_attach(struct pcmcia_device *link)
@@ -1014,7 +1007,7 @@ static void daqp_cs_detach(struct pcmcia_device *link)
 	struct local_info_t *dev = link->priv;
 
 	dev->stop = 1;
-	daqp_cs_release(link);
+	pcmcia_disable_device(link);
 
 	/* Unlink device structure, and free it */
 	dev_table[dev->table_index] = NULL;