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

Commit a4fd4946 authored by Len Brown's avatar Len Brown
Browse files

Pull misc into release branch

parents a3a1b26e 5e1f198b

drivers/acpi/namespace/nsxfeval.c

+1 −1
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle, 
 ******************************************************************************/



acpi_status

acpi_get_devices(char *HID,

acpi_get_devices(const char *HID,

		 acpi_walk_callback user_function,

		 void *context, void **return_value)

{

drivers/acpi/scan.c

+3 −2
Original line number Diff line number Diff line
@@ -35,8 +35,9 @@ struct acpi_device_bus_id{ 
 * e.g. on a device with hid:IBM0001 and cid:ACPI0001 you get:

 * char *modalias: "acpi:IBM0001:ACPI0001"

*/

int create_modalias(struct acpi_device *acpi_dev, char *modalias, int size){



static int create_modalias(struct acpi_device *acpi_dev, char *modalias,

			   int size)

{

	int len;



	if (!acpi_dev->flags.hardware_id)

drivers/acpi/sleep/main.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int wake, int *d_min_p) 
	unsigned long d_min, d_max;



	if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) {

		printk(KERN_ERR "ACPI handle has no context!\n");

		printk(KERN_DEBUG "ACPI handle has no context!\n");

		return -ENODEV;

	}

drivers/acpi/utilities/utglobal.c

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ const char *acpi_format_exception(acpi_status status) 
			    "Unknown exception code: 0x%8.8X", status));



		exception = "UNKNOWN_STATUS_CODE";

		dump_stack();

	}



	return (ACPI_CAST_PTR(const char, exception));

drivers/pci/hotplug/acpiphp_ibm.c

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static acpi_status __init ibm_find_acpi_device(acpi_handle handle, 


	status = acpi_get_object_info(handle, &info_buffer);

	if (ACPI_FAILURE(status)) {

		err("%s:  Failed to get device information", __FUNCTION__);

		err("%s:  Failed to get device information\n", __FUNCTION__);

		return 0;

	}

	info.hardware_id.value[sizeof(info.hardware_id.value) - 1] = '\0';