Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee360d68 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-assorted' 

* acpi-assorted:
  ACPI / event: remove unneeded NULL pointer check
  ACPI: Fix spelling mistake in error messages
parents 8dbb8d54 9968e459

drivers/acpi/event.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -127,11 +127,6 @@ int acpi_bus_generate_netlink_event(const char *device_class, 
	}

	}





	event = nla_data(attr);

	event = nla_data(attr);

	if (!event) {

		nlmsg_free(skb);

		return -EINVAL;

	}



	memset(event, 0, sizeof(struct acpi_genl_event));

	memset(event, 0, sizeof(struct acpi_genl_event));





	strcpy(event->device_class, device_class);

	strcpy(event->device_class, device_class);

drivers/acpi/utils.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ acpi_extract_package(union acpi_object *package, 
				break;

				break;

			default:

			default:

				printk(KERN_WARNING PREFIX "Invalid package element"

				printk(KERN_WARNING PREFIX "Invalid package element"

					      " [%d]: got number, expecing"

					      " [%d]: got number, expecting"

					      " [%c]\n",

					      " [%c]\n",

					      i, format_string[i]);

					      i, format_string[i]);

				return AE_BAD_DATA;

				return AE_BAD_DATA;
@@ -148,7 +148,7 @@ acpi_extract_package(union acpi_object *package, 
			default:

			default:

				printk(KERN_WARNING PREFIX "Invalid package element"

				printk(KERN_WARNING PREFIX "Invalid package element"

					      " [%d] got string/buffer,"

					      " [%d] got string/buffer,"

					      " expecing [%c]\n",

					      " expecting [%c]\n",

					      i, format_string[i]);

					      i, format_string[i]);

				return AE_BAD_DATA;

				return AE_BAD_DATA;

				break;

				break;