diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
| commit | 57445428488a2862840c4d7c96d7746c11031aaf (patch) | |
| tree | 60b88b3a21896a33ee4dccc727d88b745a9ff731 /drivers/pcmcia | |
| parent | 2e837819b1563679b55363d469239fdf4f17fbbb (diff) | |
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/Makefile | 2 | ||||
| -rw-r--r-- | drivers/pcmcia/cs.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index b1ac19022..6491ac4b0 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -12,8 +12,6 @@ SUB_DIRS := MOD_SUB_DIRS := $(SUB_DIRS) ALL_SUB_DIRS := $(SUB_DIRS) -MOD_LIST_NAME := PCMCIA_MODULES - ifeq ($(CONFIG_PCMCIA),y) O_OBJS := cistpl.o rsrc_mgr.o bulkmem.o OX_OBJS := ds.o cs.o diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index 85d58ad78..30995bbbe 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c @@ -975,8 +975,10 @@ int pcmcia_deregister_client(client_handle_t handle) client = &s->clients; while ((*client) && ((*client) != handle)) client = &(*client)->next; - if (*client == NULL) + if (*client == NULL) { + spin_unlock_irqrestore(&s->lock, flags); return CS_BAD_HANDLE; + } *client = handle->next; handle->client_magic = 0; kfree(handle); |