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

Commit af65cfe9 authored by Mika Westerberg's avatar Mika Westerberg Committed by Rafael J. Wysocki
Browse files

ACPI / LPSS: don't crash if a device has no MMIO resources 



Intel LPSS devices that are enumerated from ACPI have both MMIO and IRQ
resources returned in their _CRS method. However, Apple Macbook Air with
Haswell has LPSS devices enumerated from PCI bus instead and _CRS method
returns only an interrupt number (but the device has _HID set that causes
the scan handler to match it).

The current ACPI / LPSS code sets pdata->dev_desc only when MMIO resource
is found for the device and in case of Macbook Air it is never found. That
leads to a NULL pointer dereference in register_device_clock().

Correct this by always setting the pdata->dev_desc.

Reported-and-tested-by: default avatarImre Kaloz <kaloz@openwrt.org>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Cc: 3.10+ <stable@vger.kernel.org> # 3.10+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 524f42fa

drivers/acpi/acpi_lpss.c

+2 −1
Original line number Diff line number Diff line
@@ -257,12 +257,13 @@ static int acpi_lpss_create_device(struct acpi_device *adev, 
				pdata->mmio_size = resource_size(&rentry->res);

			pdata->mmio_base = ioremap(rentry->res.start,

						   pdata->mmio_size);

			pdata->dev_desc = dev_desc;

			break;

		}



	acpi_dev_free_resource_list(&resource_list);



	pdata->dev_desc = dev_desc;



	if (dev_desc->clk_required) {

		ret = register_device_clock(adev, pdata);

		if (ret) {