diff options
author | Len Brown <len.brown@intel.com> | 2006-06-15 15:40:39 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-15 15:40:39 -0400 |
commit | 36a557d1f48669c57f59e37d9334400a29e4e53c (patch) | |
tree | 6d97b3eb9fefa6a82dd11dd7caeb799f986bdc48 /drivers/acpi/hotkey.c | |
parent | 4e8f10b7ccf1c3c53a818a157962074a7340732e (diff) | |
parent | 6665bda76461308868bd1e52caf627f4cb29ed32 (diff) |
Pull trivial into release branch
Diffstat (limited to 'drivers/acpi/hotkey.c')
-rw-r--r-- | drivers/acpi/hotkey.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/hotkey.c b/drivers/acpi/hotkey.c index 2e2e4051dfa..c25b2b92edc 100644 --- a/drivers/acpi/hotkey.c +++ b/drivers/acpi/hotkey.c @@ -723,6 +723,8 @@ get_parms(char *config_record, goto do_fail; count = tmp1 - tmp; *action_handle = (char *)kmalloc(count + 1, GFP_KERNEL); + if (!*action_handle) + goto do_fail; strncpy(*action_handle, tmp, count); *(*action_handle + count) = 0; |