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

Commit 2bad7e27 authored by Dominik Brodowski's avatar Dominik Brodowski Committed by Rafael J. Wysocki
Browse files

ACPI / osl: use same type for acpi_predefined_names values as in definition 



In the definition of struct acpi_predefined_names, value is of
type char *. Make the OSL override function also work with type
char * (or, more precisely, with a pointer to it).

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 030bbdbf

drivers/acpi/osl.c

+1 −1
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ static char acpi_os_name[ACPI_MAX_OVERRIDE_LEN]; 


acpi_status

acpi_os_predefined_override(const struct acpi_predefined_names *init_val,

			    acpi_string * new_val)

			    char **new_val)

{

	if (!init_val || !new_val)

		return AE_BAD_PARAMETER;

include/acpi/acpiosxf.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ acpi_physical_address acpi_os_get_root_pointer(void); 
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_predefined_override

acpi_status

acpi_os_predefined_override(const struct acpi_predefined_names *init_val,

			    acpi_string * new_val);

			    char **new_val);

#endif



#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_table_override