diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-07 17:11:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-07 17:11:09 -0400 |
| commit | 2c32b1dab508ccaa4aea1a9d6047b65fc708e929 (patch) | |
| tree | 7a97585278a6e5d49f0b969b8047918f4f5239c2 /drivers/pcmcia/ds.c | |
| parent | 48fe37cb53a40e13c2f9fc974f574e38d18be303 (diff) | |
| parent | 15d0a873549ef0bdeaa04dacf29a3e15de886d03 (diff) | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
pcmcia: fix compilation after 16bit state locking changes
pcmcia: order userspace suspend and resume requests
pcmcia: avoid pccard_validate_cis failure in resume callpath
Diffstat (limited to 'drivers/pcmcia/ds.c')
| -rw-r--r-- | drivers/pcmcia/ds.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 508f94a2a78d..041eee43fd8d 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
| @@ -1283,6 +1283,7 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority) | |||
| 1283 | destroy_cis_cache(skt); | 1283 | destroy_cis_cache(skt); |
| 1284 | kfree(skt->fake_cis); | 1284 | kfree(skt->fake_cis); |
| 1285 | skt->fake_cis = NULL; | 1285 | skt->fake_cis = NULL; |
| 1286 | s->functions = 0; | ||
| 1286 | mutex_unlock(&s->ops_mutex); | 1287 | mutex_unlock(&s->ops_mutex); |
| 1287 | /* now, add the new card */ | 1288 | /* now, add the new card */ |
| 1288 | ds_event(skt, CS_EVENT_CARD_INSERTION, | 1289 | ds_event(skt, CS_EVENT_CARD_INSERTION, |