Merge branch 'acpi-assorted'

* acpi-assorted:
  ACPI / event: remove unneeded NULL pointer check
  ACPI: Fix spelling mistake in error messages

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;