---

yaml --- r: 317590 b: refs/heads/master c: c8b2ae2 h: refs/heads/master v: v3
git-mirror · Jun 26, 2012 · 52d0cdb · 52d0cdb
1 parent 3059645
commit 52d0cdb
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c2107ff46d58a9db6d8cadcbe18fa631fb4f7cd9
+refs/heads/master: c8b2ae2b98bad7870ec6be24e517bacffd76ea8e
diff --git a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -625,7 +625,6 @@ static int das16cs_timer_insn_config(struct comedi_device *dev,
 
 struct local_info_t {
 	struct pcmcia_device *link;
-	int stop;
 	struct bus_operations *bus;
 };
 
@@ -674,7 +673,6 @@ static int das16cs_pcmcia_attach(struct pcmcia_device *link)
 
 static void das16cs_pcmcia_detach(struct pcmcia_device *link)
 {
-	((struct local_info_t *)link->priv)->stop = 1;
 	pcmcia_disable_device(link);
 	/* This points to the parent struct local_info_t struct */
 	kfree(link->priv);
@@ -683,19 +681,11 @@ static void das16cs_pcmcia_detach(struct pcmcia_device *link)
 
 static int das16cs_pcmcia_suspend(struct pcmcia_device *link)
 {
-	struct local_info_t *local = link->priv;
-
-	/* Mark the device as stopped, to block IO until later */
-	local->stop = 1;
-
 	return 0;
 }
 
 static int das16cs_pcmcia_resume(struct pcmcia_device *link)
 {
-	struct local_info_t *local = link->priv;
-
-	local->stop = 0;
 	return 0;
 }