diff options
-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, | |||
127 | } | 127 | } |
128 | 128 | ||
129 | event = nla_data(attr); | 129 | event = nla_data(attr); |
130 | if (!event) { | ||
131 | nlmsg_free(skb); | ||
132 | return -EINVAL; | ||
133 | } | ||
134 | |||
135 | memset(event, 0, sizeof(struct acpi_genl_event)); | 130 | memset(event, 0, sizeof(struct acpi_genl_event)); |
136 | 131 | ||
137 | strcpy(event->device_class, device_class); | 132 | 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, | |||
121 | break; | 121 | break; |
122 | default: | 122 | default: |
123 | printk(KERN_WARNING PREFIX "Invalid package element" | 123 | printk(KERN_WARNING PREFIX "Invalid package element" |
124 | " [%d]: got number, expecing" | 124 | " [%d]: got number, expecting" |
125 | " [%c]\n", | 125 | " [%c]\n", |
126 | i, format_string[i]); | 126 | i, format_string[i]); |
127 | return AE_BAD_DATA; | 127 | return AE_BAD_DATA; |
@@ -148,7 +148,7 @@ acpi_extract_package(union acpi_object *package, | |||
148 | default: | 148 | default: |
149 | printk(KERN_WARNING PREFIX "Invalid package element" | 149 | printk(KERN_WARNING PREFIX "Invalid package element" |
150 | " [%d] got string/buffer," | 150 | " [%d] got string/buffer," |
151 | " expecing [%c]\n", | 151 | " expecting [%c]\n", |
152 | i, format_string[i]); | 152 | i, format_string[i]); |
153 | return AE_BAD_DATA; | 153 | return AE_BAD_DATA; |
154 | break; | 154 | break; |