From b0036363564df14a56c5328210a496e081231b2f Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Wed, 8 Feb 2012 17:13:41 -0800
Subject: [PATCH] --- yaml --- r: 287339 b: refs/heads/master c:
 025e4ab3db07fcbf62c01e4f30d1012234beb980 h: refs/heads/master i:   287337:
 55bf329fe128a97cc7e494944c27177a7928ac07   287335:
 947e41ef1a10c64dcba7d1f77d425a5aa0779fec v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/pcmcia/ds.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 76d6238e5f72..5f671b0126a7 100644
--- 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
index 749c2a16012c..1932029de48d 100644
--- 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");