diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-11 12:55:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-11 12:55:21 -0400 |
| commit | f1f6ea352257e0df33cf0184ba777c293cb6f1d6 (patch) | |
| tree | bff9547a1f45db619848c5de62033cb48e61c73b /drivers/pcmcia/ds.c | |
| parent | 63c70a0d7b59bac08bd14cd24c36f76aafc25de6 (diff) | |
| parent | b83156b52dd77979cc93bafc2283929532f6f7d0 (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: avoid validate_cis failure on CIS override
pcmcia: dev_node removal bugfix
pcmcia: yenta_socket.c Remove extra #ifdef CONFIG_YENTA_TI
pcmcia: only keep saved I365_CSCINT flag if there is no PCI irq
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) | |||
| 671 | if (old_funcs != new_funcs) { | 671 | if (old_funcs != new_funcs) { |
| 672 | /* we need to re-start */ | 672 | /* we need to re-start */ |
| 673 | pcmcia_card_remove(s, NULL); | 673 | pcmcia_card_remove(s, NULL); |
| 674 | s->functions = 0; | ||
| 674 | pcmcia_card_add(s); | 675 | pcmcia_card_add(s); |
| 675 | } | 676 | } |
| 676 | } | 677 | } |