diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-07-14 15:15:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-07-14 15:15:07 +0200 |
| commit | d5585d6d3e2db78dbca48b2b9537dd9abd8b4cae (patch) | |
| tree | 413e7ba7d023b674be23b8bf5284ecd3d24232b1 /drivers/pcmcia/ds.c | |
| parent | 7d442d2c13f0bd263f516733c50126ce6f1e85c7 (diff) | |
| parent | 1c5474a65bf15a4cb162dfff86d6d0b5a08a740c (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'drivers/pcmcia/ds.c')
| -rw-r--r-- | drivers/pcmcia/ds.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 9fc339845538..eac961463be2 100644 --- 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; } |