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

Commit fd8049d6 authored by Barnabás Pőcze's avatar Barnabás Pőcze Committed by Greg Kroah-Hartman
Browse files

platform/x86: wmi: remove unnecessary argument 



[ Upstream commit 84eacf7e6413d5e2d2f4f9dddf9216c18a3631cf ]

The GUID block is available for `wmi_create_device()`
through `wblock->gblock`. Use that consistently in
the function instead of using a mix of `gblock` and
`wblock->gblock`.

Signed-off-by: default avatarBarnabás Pőcze <pobrn@protonmail.com>
Link: https://lore.kernel.org/r/20210904175450.156801-8-pobrn@protonmail.com


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Stable-dep-of: 028e6e204ace ("platform/x86: wmi: Break possible infinite loop when parsing GUID")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4c8e26fc

drivers/platform/x86/wmi.c

+4 −5
Original line number Diff line number Diff line
@@ -1039,7 +1039,6 @@ static const struct device_type wmi_type_data = { 
};



static int wmi_create_device(struct device *wmi_bus_dev,

			     const struct guid_block *gblock,

			     struct wmi_block *wblock,

			     struct acpi_device *device)

{
@@ -1047,12 +1046,12 @@ static int wmi_create_device(struct device *wmi_bus_dev, 
	char method[5];

	int result;



	if (gblock->flags & ACPI_WMI_EVENT) {

	if (wblock->gblock.flags & ACPI_WMI_EVENT) {

		wblock->dev.dev.type = &wmi_type_event;

		goto out_init;

	}



	if (gblock->flags & ACPI_WMI_METHOD) {

	if (wblock->gblock.flags & ACPI_WMI_METHOD) {

		wblock->dev.dev.type = &wmi_type_method;

		mutex_init(&wblock->char_mutex);

		goto out_init;
@@ -1102,7 +1101,7 @@ static int wmi_create_device(struct device *wmi_bus_dev, 
	wblock->dev.dev.bus = &wmi_bus_type;

	wblock->dev.dev.parent = wmi_bus_dev;



	dev_set_name(&wblock->dev.dev, "%pUL", gblock->guid);

	dev_set_name(&wblock->dev.dev, "%pUL", wblock->gblock.guid);



	device_initialize(&wblock->dev.dev);
@@ -1194,7 +1193,7 @@ static int parse_wdg(struct device *wmi_bus_dev, struct acpi_device *device) 
		wblock->acpi_device = device;

		wblock->gblock = gblock[i];



		retval = wmi_create_device(wmi_bus_dev, &gblock[i], wblock, device);

		retval = wmi_create_device(wmi_bus_dev, wblock, device);

		if (retval) {

			kfree(wblock);

			continue;