diff options
| author | Chris Metcalf | 2010-06-25 20:38:16 +0200 |
|---|---|---|
| committer | Chris Metcalf | 2010-06-25 20:38:16 +0200 |
| commit | 9c78965ca18594fe0a34a1a1b13781b10f85e4bc (patch) | |
| tree | 60c9e83d3c2b56e3c7f5169b63577a72bf7ddb57 /drivers/pcmcia/ds.c | |
| parent | Revert adding some arch-specific signal syscalls to <linux/syscalls.h>. (diff) | |
| parent | Linux 2.6.35-rc3 (diff) | |
| download | kernel-qcow2-linux-9c78965ca18594fe0a34a1a1b13781b10f85e4bc.tar.gz kernel-qcow2-linux-9c78965ca18594fe0a34a1a1b13781b10f85e4bc.tar.xz kernel-qcow2-linux-9c78965ca18594fe0a34a1a1b13781b10f85e4bc.zip | |
Merge branch 'master' into for-linus
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 7ef7adee5e4f..9fc339845538 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c @@ -671,6 +671,7 @@ static void pcmcia_requery(struct pcmcia_socket *s) if (old_funcs != new_funcs) { /* we need to re-start */ pcmcia_card_remove(s, NULL); + s->functions = 0; pcmcia_card_add(s); } } |