From 122cd7e84600c837dea762a5eaeb4b2bfd6e80de Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@gmail.com>
Date: Tue, 27 Dec 2011 16:25:44 +0800
Subject: [PATCH] --- yaml --- r: 288050 b: refs/heads/master c:
 8fb28231a907f02d879a075cee7ec610b6439be0 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 59fa5846d4ba..6ca1554c8931 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be9bac9d33c0864ac7684c683df5da3b0c38e3b7
+refs/heads/master: 8fb28231a907f02d879a075cee7ec610b6439be0
diff --git a/trunk/drivers/pcmcia/pxa2xx_base.c b/trunk/drivers/pcmcia/pxa2xx_base.c
index a87e2728b2c3..64d433ec4fc6 100644
--- a/trunk/drivers/pcmcia/pxa2xx_base.c
+++ b/trunk/drivers/pcmcia/pxa2xx_base.c
@@ -328,21 +328,15 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
 			goto err1;
 	}
 
-	if (ret) {
-		while (--i >= 0)
-			soc_pcmcia_remove_one(&sinfo->skt[i]);
-		kfree(sinfo);
-		clk_put(clk);
-	} else {
-		pxa2xx_configure_sockets(&dev->dev);
-		dev_set_drvdata(&dev->dev, sinfo);
-	}
+	pxa2xx_configure_sockets(&dev->dev);
+	dev_set_drvdata(&dev->dev, sinfo);
 
 	return 0;
 
 err1:
 	while (--i >= 0)
 		soc_pcmcia_remove_one(&sinfo->skt[i]);
+	clk_put(clk);
 	kfree(sinfo);
 err0:
 	return ret;