diff options
| author |   Dominik Brodowski <linux@dominikbrodowski.net> | 2006-11-03 10:54:00 -0500 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-12-04 20:09:14 -0500 |
| commit | 4ae1cbf17d14ba6fd316a94b290ea4e741cba15c (patch) | |
| tree | 56c5f6939fd486b6041945497d2d541e76b0e1e6 /drivers/pcmcia/socket_sysfs.c | |
| parent | [PATCH] cm4000_cs: fix return value check (diff) | |
| download | linux-dev-4ae1cbf17d14ba6fd316a94b290ea4e741cba15c.tar.xz linux-dev-4ae1cbf17d14ba6fd316a94b290ea4e741cba15c.zip | |
[PATCH] pcmcia: start over after CIS override
When overriding the CIS, re-start the configuration of the card from
scratch. Reported and debugged by Fabrice Bellet <fabrice@bellet.info>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/socket_sysfs.c')
| -rw-r--r-- | drivers/pcmcia/socket_sysfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c index 933cd864a5c9..b005602d6b53 100644 --- a/drivers/pcmcia/socket_sysfs.c +++ b/drivers/pcmcia/socket_sysfs.c @@ -188,7 +188,7 @@ static ssize_t pccard_store_resource(struct class_device *dev, const char *buf, (s->state & SOCKET_PRESENT) && !(s->state & SOCKET_CARDBUS)) { if (try_module_get(s->callback->owner)) { - s->callback->requery(s); + s->callback->requery(s, 0); module_put(s->callback->owner); } } @@ -325,7 +325,7 @@ static ssize_t pccard_store_cis(struct kobject *kobj, char *buf, loff_t off, siz if ((s->callback) && (s->state & SOCKET_PRESENT) && !(s->state & SOCKET_CARDBUS)) { if (try_module_get(s->callback->owner)) { - s->callback->requery(s); + s->callback->requery(s, 1); module_put(s->callback->owner); } } |