diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /drivers/pcmcia/cs.c | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'drivers/pcmcia/cs.c')
| -rw-r--r-- | drivers/pcmcia/cs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index 21482915a..b6e99d212 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c @@ -319,6 +319,8 @@ socket_info_t *pcmcia_register_socket (int slot, DEBUG(0, "cs: pcmcia_register_socket(0x%p)\n", ss_entry); s = kmalloc(sizeof(struct socket_info_t), GFP_KERNEL); + if (!s) + return NULL; memset(s, 0, sizeof(socket_info_t)); s->ss_entry = ss_entry; |