From 6eb3bd064707518acfea7bc96085f3bab05bb6bc Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 14 Mar 2013 13:33:15 +0000 Subject: [PATCH] --- yaml --- r: 375291 b: refs/heads/master c: a30450c7bbb04212c5f01936274ca8d965cabf79 h: refs/heads/master i: 375289: aa145b0576faed7fe16525051c4924bf4dbb256e 375287: 94d5d3be4907d2beb0759814522238787712cdff v: v3 --- [refs] | 2 +- trunk/drivers/platform/x86/dell-laptop.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a0f6dc5f8336..626dc6a93a43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7783819920ca52fc582a2782f654fe6ed373f465 +refs/heads/master: a30450c7bbb04212c5f01936274ca8d965cabf79 diff --git a/trunk/drivers/platform/x86/dell-laptop.c b/trunk/drivers/platform/x86/dell-laptop.c index fa3ee6209572..1134119521ac 100644 --- a/trunk/drivers/platform/x86/dell-laptop.c +++ b/trunk/drivers/platform/x86/dell-laptop.c @@ -284,6 +284,7 @@ static void __init parse_da_table(const struct dmi_header *dm) { /* Final token is a terminator, so we don't want to copy it */ int tokens = (dm->length-11)/sizeof(struct calling_interface_token)-1; + struct calling_interface_token *new_da_tokens; struct calling_interface_structure *table = container_of(dm, struct calling_interface_structure, header); @@ -296,12 +297,13 @@ static void __init parse_da_table(const struct dmi_header *dm) da_command_address = table->cmdIOAddress; da_command_code = table->cmdIOCode; - da_tokens = krealloc(da_tokens, (da_num_tokens + tokens) * - sizeof(struct calling_interface_token), - GFP_KERNEL); + new_da_tokens = krealloc(da_tokens, (da_num_tokens + tokens) * + sizeof(struct calling_interface_token), + GFP_KERNEL); - if (!da_tokens) + if (!new_da_tokens) return; + da_tokens = new_da_tokens; memcpy(da_tokens+da_num_tokens, table->tokens, sizeof(struct calling_interface_token) * tokens);