---

yaml --- r: 287339 b: refs/heads/master c: 025e4ab h: refs/heads/master i: 287337: 55bf329 287335: 947e41e v: v3
git-mirror · Feb 9, 2012 · b003636 · b003636
1 parent 78287d2
commit b003636
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9980cdcf2524c5fe15d8cbae9c97b3ed6385563
+refs/heads/master: 025e4ab3db07fcbf62c01e4f30d1012234beb980
diff --git a/trunk/drivers/pcmcia/ds.c b/trunk/drivers/pcmcia/ds.c
@@ -1269,10 +1269,8 @@ static int pcmcia_bus_add(struct pcmcia_socket *skt)
 
 static int pcmcia_bus_early_resume(struct pcmcia_socket *skt)
 {
-	if (!verify_cis_cache(skt)) {
-		pcmcia_put_socket(skt);
+	if (!verify_cis_cache(skt))
 		return 0;
-	}
 
 	dev_dbg(&skt->dev, "cis mismatch - different card\n");