---

yaml --- r: 317696 b: refs/heads/master c: 44378f6 h: refs/heads/master v: v3
git-mirror · Jul 6, 2012 · 636e497 · 636e497
1 parent 6bd2b17
commit 636e497
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb795746195bb8566ecfb50dec9f63676fc29575
+refs/heads/master: 44378f65f1b528d3a368a515598e44a73a9c3a76
diff --git a/trunk/drivers/staging/comedi/drivers/das08_cs.c b/trunk/drivers/staging/comedi/drivers/das08_cs.c
@@ -149,7 +149,6 @@ static void das08_pcmcia_config(struct pcmcia_device *link)
 
 struct local_info_t {
 	struct pcmcia_device *link;
-	int stop;
 	struct bus_operations *bus;
 };
 
@@ -178,7 +177,6 @@ static void das08_pcmcia_detach(struct pcmcia_device *link)
 
 	dev_dbg(&link->dev, "das08_pcmcia_detach\n");
 
-	((struct local_info_t *)link->priv)->stop = 1;
 	das08_pcmcia_release(link);
 
 	/* This points to the parent struct local_info_t struct */
@@ -188,18 +186,11 @@ static void das08_pcmcia_detach(struct pcmcia_device *link)
 
 static int das08_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 das08_pcmcia_resume(struct pcmcia_device *link)
 {
-	struct local_info_t *local = link->priv;
-
-	local->stop = 0;
 	return 0;
 }