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

Commit adda7661 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: don't free non-existent backlight in acpi video module
  toshiba_acpi: return on a fail path
  ACPICA: Windows compatibility fix: same buffer/string store
parents 8442edc1 e29b3ee3

drivers/acpi/acpica/exstorob.c

+12 −0
Original line number Diff line number Diff line
@@ -70,6 +70,12 @@ acpi_ex_store_buffer_to_buffer(union acpi_operand_object *source_desc, 


	ACPI_FUNCTION_TRACE_PTR(ex_store_buffer_to_buffer, source_desc);



	/* If Source and Target are the same, just return */



	if (source_desc == target_desc) {

		return_ACPI_STATUS(AE_OK);

	}



	/* We know that source_desc is a buffer by now */



	buffer = ACPI_CAST_PTR(u8, source_desc->buffer.pointer);
@@ -161,6 +167,12 @@ acpi_ex_store_string_to_string(union acpi_operand_object *source_desc, 


	ACPI_FUNCTION_TRACE_PTR(ex_store_string_to_string, source_desc);



	/* If Source and Target are the same, just return */



	if (source_desc == target_desc) {

		return_ACPI_STATUS(AE_OK);

	}



	/* We know that source_desc is a string by now */



	buffer = ACPI_CAST_PTR(u8, source_desc->string.pointer);

drivers/acpi/video.c

+5 −2
Original line number Diff line number Diff line
@@ -2004,8 +2004,11 @@ static int acpi_video_bus_put_one_device(struct acpi_video_device *device) 
	status = acpi_remove_notify_handler(device->dev->handle,

					    ACPI_DEVICE_NOTIFY,

					    acpi_video_device_notify);

	if (device->backlight) {

		sysfs_remove_link(&device->backlight->dev.kobj, "device");

		backlight_device_unregister(device->backlight);

		device->backlight = NULL;

	}

	if (device->cdev) {

		sysfs_remove_link(&device->dev->dev.kobj,

				  "thermal_cooling");

drivers/platform/x86/toshiba_acpi.c

+1 −0
Original line number Diff line number Diff line
@@ -335,6 +335,7 @@ static void bt_rfkill_poll(struct rfkill *rfkill, void *data) 
	if (hci_result != HCI_SUCCESS) {

		/* Can't do anything useful */

		mutex_unlock(&dev->mutex);

		return;

	}



	new_rfk_state = value;