From b6227618658578a299cea8a0a8d6f80fef5e1c60 Mon Sep 17 00:00:00 2001
From: Om Narasimhan <om.turyx@gmail.com>
Date: Fri, 20 Oct 2006 14:44:15 -0700
Subject: [PATCH] --- yaml --- r: 40443 b: refs/heads/master c:
 a230a6785dd5af84b8b043a64d8df8adc81f3724 h: refs/heads/master i:   40441:
 38b449aaa340bc7e63753091219f9656b2acfa9e   40439:
 8f1f2fa96d20111b5f4c844358ed84d15d99e450 v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/pcmcia/au1000_generic.c | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6d32d82055b7..45613a737231 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f465ce176fb2f1778a04fc3fcb2b8aa564901419
+refs/heads/master: a230a6785dd5af84b8b043a64d8df8adc81f3724
diff --git a/trunk/drivers/pcmcia/au1000_generic.c b/trunk/drivers/pcmcia/au1000_generic.c
index d5dd0ce65536..5387de6216fb 100644
--- a/trunk/drivers/pcmcia/au1000_generic.c
+++ b/trunk/drivers/pcmcia/au1000_generic.c
@@ -351,6 +351,7 @@ struct skt_dev_info {
 int au1x00_pcmcia_socket_probe(struct device *dev, struct pcmcia_low_level *ops, int first, int nr)
 {
 	struct skt_dev_info *sinfo;
+	struct au1000_pcmcia_socket *skt;
 	int ret, i;
 
 	sinfo = kzalloc(sizeof(struct skt_dev_info), GFP_KERNEL);
@@ -365,7 +366,7 @@ int au1x00_pcmcia_socket_probe(struct device *dev, struct pcmcia_low_level *ops,
 	 * Initialise the per-socket structure.
 	 */
 	for (i = 0; i < nr; i++) {
-		struct au1000_pcmcia_socket *skt = PCMCIA_SOCKET(i);
+		skt = PCMCIA_SOCKET(i);
 		memset(skt, 0, sizeof(*skt));
 
 		skt->socket.resource_ops = &pccard_static_ops;
@@ -438,17 +439,19 @@ int au1x00_pcmcia_socket_probe(struct device *dev, struct pcmcia_low_level *ops,
 	dev_set_drvdata(dev, sinfo);
 	return 0;
 
-	do {
-		struct au1000_pcmcia_socket *skt = PCMCIA_SOCKET(i);
+
+out_err:
+	flush_scheduled_work();
+	ops->hw_shutdown(skt);
+	while (i-- > 0) {
+		skt = PCMCIA_SOCKET(i);
 
 		del_timer_sync(&skt->poll_timer);
 		pcmcia_unregister_socket(&skt->socket);
-out_err:
 		flush_scheduled_work();
 		ops->hw_shutdown(skt);
 
-		i--;
-	} while (i > 0);
+	}
 	kfree(sinfo);
 out:
 	return ret;