diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 19:19:42 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 19:19:42 +0100 |
| commit | ee360d688c8e37f81c92039f76bebaddbe36befe (patch) | |
| tree | 7d2b4106f9edb4d79b9947224390fc84f53835c8 /drivers/acpi | |
| parent | 8dbb8d54fe0bb551d515393fca495508d36af2a1 (diff) | |
| parent | 9968e459f1378a1c00301472cfe672497fe001d5 (diff) | |
Merge branch 'acpi-assorted'
* acpi-assorted:
ACPI / event: remove unneeded NULL pointer check
ACPI: Fix spelling mistake in error messages
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/event.c | 5 | ||||
| -rw-r--r-- | drivers/acpi/utils.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c index 8247fcdde079..fdef416c0ff6 100644 --- a/drivers/acpi/event.c +++ b/drivers/acpi/event.c @@ -127,11 +127,6 @@ int acpi_bus_generate_netlink_event(const char *device_class, } event = nla_data(attr); - if (!event) { - nlmsg_free(skb); - return -EINVAL; - } - memset(event, 0, sizeof(struct acpi_genl_event)); strcpy(event->device_class, device_class); diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index fc2cd3284080..6d408bfbbb1d 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c @@ -121,7 +121,7 @@ acpi_extract_package(union acpi_object *package, break; default: printk(KERN_WARNING PREFIX "Invalid package element" - " [%d]: got number, expecing" + " [%d]: got number, expecting" " [%c]\n", i, format_string[i]); return AE_BAD_DATA; @@ -148,7 +148,7 @@ acpi_extract_package(union acpi_object *package, default: printk(KERN_WARNING PREFIX "Invalid package element" " [%d] got string/buffer," - " expecing [%c]\n", + " expecting [%c]\n", i, format_string[i]); return AE_BAD_DATA; break; |