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

Merge branches 'acpi-property' and 'acpi-resource' 

Merge a new ACPI IRQ override quirk for Eluktronics MECH-17 (Gannon
Kolding) and an acpi_data_prop_read() fix making it reflect the OF
counterpart behavior in error cases (Andy Shevchenko).

* acpi-property:
  ACPI: property: Fix return value for nval == 0 in acpi_data_prop_read()

* acpi-resource:
  ACPI: resource: IRQ override for Eluktronics MECH-17
parents 7f5704b6 ab930483 607ab6f8

drivers/acpi/property.c

+5 −5
Original line number Diff line number Diff line
@@ -1187,8 +1187,6 @@ static int acpi_data_prop_read(const struct acpi_device_data *data, 
		}

		break;

	}

	if (nval == 0)

		return -EINVAL;



	if (obj->type == ACPI_TYPE_BUFFER) {

		if (proptype != DEV_PROP_U8)
@@ -1212,9 +1210,11 @@ static int acpi_data_prop_read(const struct acpi_device_data *data, 
		ret = acpi_copy_property_array_uint(items, (u64 *)val, nval);

		break;

	case DEV_PROP_STRING:

		ret = acpi_copy_property_array_string(

			items, (char **)val,

			min_t(u32, nval, obj->package.count));

		nval = min_t(u32, nval, obj->package.count);

		if (nval == 0)

			return -ENODATA;



		ret = acpi_copy_property_array_string(items, (char **)val, nval);

		break;

	default:

		ret = -EINVAL;

drivers/acpi/resource.c

+6 −0
Original line number Diff line number Diff line
@@ -563,6 +563,12 @@ static const struct dmi_system_id irq1_edge_low_force_override[] = { 
			DMI_MATCH(DMI_BOARD_NAME, "RP-15"),

		},

	},

	{

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Eluktronics Inc."),

			DMI_MATCH(DMI_BOARD_NAME, "MECH-17"),

		},

	},

	{

		/* TongFang GM6XGxX/TUXEDO Stellaris 16 Gen5 AMD */

		.matches = {