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

Commit 36a557d1 authored by Len Brown's avatar Len Brown
Browse files

Pull trivial into release branch

parents 4e8f10b7 6665bda7

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -147,6 +147,9 @@ running once the system is up. 
	acpi_irq_isa=	[HW,ACPI] If irq_balance, mark listed IRQs used by ISA

			Format: <irq>,<irq>...



	acpi_os_name=	[HW,ACPI] Tell ACPI BIOS the name of the OS

			Format: To spoof as Windows 98: ="Microsoft Windows"



	acpi_osi=	[HW,ACPI] empty param disables _OSI



	acpi_serialize	[HW,ACPI] force serialization of AML methods

drivers/acpi/hotkey.c

+2 −0
Original line number Diff line number Diff line
@@ -723,6 +723,8 @@ get_parms(char *config_record, 
		goto do_fail;

	count = tmp1 - tmp;

	*action_handle = (char *)kmalloc(count + 1, GFP_KERNEL);

	if (!*action_handle)

		goto do_fail;

	strncpy(*action_handle, tmp, count);

	*(*action_handle + count) = 0;

drivers/acpi/thermal.c

+3 −1
Original line number Diff line number Diff line
@@ -941,8 +941,10 @@ acpi_thermal_write_trip_points(struct file *file, 
	memset(limit_string, 0, ACPI_THERMAL_MAX_LIMIT_STR_LEN);



	active = kmalloc(ACPI_THERMAL_MAX_ACTIVE * sizeof(int), GFP_KERNEL);

	if (!active)

	if (!active) {

		kfree(limit_string);

		return_VALUE(-ENOMEM);

	}



	if (!tz || (count > ACPI_THERMAL_MAX_LIMIT_STR_LEN - 1)) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid argument\n"));

drivers/acpi/video.c

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ acpi_video_device_lcd_query_levels(struct acpi_video_device *device, 
	if (!ACPI_SUCCESS(status))

		return_VALUE(status);

	obj = (union acpi_object *)buffer.pointer;

	if (!obj && (obj->type != ACPI_TYPE_PACKAGE)) {

	if (!obj || (obj->type != ACPI_TYPE_PACKAGE)) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR, "Invalid _BCL data\n"));

		status = -EFAULT;

		goto err;