Merge branch 'acpi-assorted'

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

diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c
index 8247fcdde0795b37377bdec44d6271ca16ad225d..fdef416c0ff6f0384e107466b47b1ff8f2bac9aa 100644 (file)
--- 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 fc2cd328408053dfaa37eceb227de974b2796bf6..6d408bfbbb1d0c66dbef28d02137dbda0777d9f4 100644 (file)
--- 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;