Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/gi…

…t/brodo/pcmcia-2.6 * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: do not initialize the present flag too late.
mariux64 · Jul 7, 2010 · 8b8ce88 · 8b8ce88
2 parents 7491eb9 + e4f1ac2
commit 8b8ce88
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
@@ -1356,6 +1356,7 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,
 	INIT_LIST_HEAD(&socket->devices_list);
 	memset(&socket->pcmcia_state, 0, sizeof(u8));
 	socket->device_count = 0;
+	atomic_set(&socket->present, 0);
 
 	ret = pccard_register_pcmcia(socket, &pcmcia_bus_callback);
 	if (ret) {
@@ -1364,8 +1365,6 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev,
 		return ret;
 	}
 
-	atomic_set(&socket->present, 0);
-
 	return 0;
 }