diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-09-10 23:15:17 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-09-10 23:15:17 +0200 |
| commit | 416fd1ae87c2b8e40f2f39dc4bbe1a3d4d4391cd (patch) | |
| tree | 8f57bcd371f632c83d2b981f157630b83568f731 /drivers/acpi | |
| parent | 8ca11824eebdcb41885fee118a76b9dd44a67200 (diff) | |
| parent | af65cfe9aeae03e0682bebdf4db94582d75562dd (diff) | |
| download | linux-stable-416fd1ae87c2b8e40f2f39dc4bbe1a3d4d4391cd.tar.gz linux-stable-416fd1ae87c2b8e40f2f39dc4bbe1a3d4d4391cd.tar.bz2 linux-stable-416fd1ae87c2b8e40f2f39dc4bbe1a3d4d4391cd.zip | |
Merge branch 'acpi-assorted'
* acpi-assorted:
ACPI / LPSS: don't crash if a device has no MMIO resources
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/acpi_lpss.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c index 6a382188fa20..fb78bb9ad8f6 100644 --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/acpi_lpss.c @@ -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) { |