diff options
Diffstat (limited to 'drivers/pcmcia/cistpl.c')
-rw-r--r-- | drivers/pcmcia/cistpl.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c index 3afb682255a0..2dc3e611a9a3 100644 --- a/drivers/pcmcia/cistpl.c +++ b/drivers/pcmcia/cistpl.c | |||
@@ -334,10 +334,8 @@ void destroy_cis_cache(struct pcmcia_socket *s) | |||
334 | /* | 334 | /* |
335 | * If there was a fake CIS, destroy that as well. | 335 | * If there was a fake CIS, destroy that as well. |
336 | */ | 336 | */ |
337 | if (s->fake_cis) { | 337 | kfree(s->fake_cis); |
338 | kfree(s->fake_cis); | 338 | s->fake_cis = NULL; |
339 | s->fake_cis = NULL; | ||
340 | } | ||
341 | } | 339 | } |
342 | EXPORT_SYMBOL(destroy_cis_cache); | 340 | EXPORT_SYMBOL(destroy_cis_cache); |
343 | 341 | ||
@@ -386,10 +384,8 @@ int verify_cis_cache(struct pcmcia_socket *s) | |||
386 | 384 | ||
387 | int pcmcia_replace_cis(struct pcmcia_socket *s, cisdump_t *cis) | 385 | int pcmcia_replace_cis(struct pcmcia_socket *s, cisdump_t *cis) |
388 | { | 386 | { |
389 | if (s->fake_cis != NULL) { | 387 | kfree(s->fake_cis); |
390 | kfree(s->fake_cis); | 388 | s->fake_cis = NULL; |
391 | s->fake_cis = NULL; | ||
392 | } | ||
393 | if (cis->Length > CISTPL_MAX_CIS_SIZE) | 389 | if (cis->Length > CISTPL_MAX_CIS_SIZE) |
394 | return CS_BAD_SIZE; | 390 | return CS_BAD_SIZE; |
395 | s->fake_cis = kmalloc(cis->Length, GFP_KERNEL); | 391 | s->fake_cis = kmalloc(cis->Length, GFP_KERNEL); |