potential crash fix : drivers/pcmcia/au1000_generic

[Om Narasimhan]

Tested by compiling.

I have not subscribed to pcmcia list. Please cc me any comments.

Signed off by Om Narasimhan <om.turyx@xxxxxxxxx>

drivers/pcmcia/au1000_generic.c |   13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c
index d5dd0ce..9a87a87 100644
--- a/drivers/pcmcia/au1000_generic.c
+++ b/drivers/pcmcia/au1000_generic.c
@@ -4,7 +4,7 @@
 *
 * Copyright 2001-2003 MontaVista Software Inc.
 * Author: MontaVista Software, Inc.
- *         	ppopov@xxxxxxxxxxxxxxxxx or source@xxxxxxxxxx
+ *			ppopov@xxxxxxxxxxxxxxxxx or source@xxxxxxxxxx
 *
 * Copyright 2004 Pete Popov, Embedded Alley Solutions, Inc.
 * Updated the driver to 2.6. Followed the sa11xx API and largely
@@ -438,17 +438,16 @@ #endif
	dev_set_drvdata(dev, sinfo);
	return 0;

-	do {
+out_err:
+	flush_scheduled_work();
+	ops->hw_shutdown(skt);
+	while (i-- > 0) {
		struct au1000_pcmcia_socket *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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/