Browse Source

Merge branch 'acpi-assorted'

* acpi-assorted:
  ACPI / LPSS: don't crash if a device has no MMIO resources
Rafael J. Wysocki 12 years ago
parent
commit
416fd1ae87
1 changed files with 2 additions and 1 deletions
  1. 2 1
      drivers/acpi/acpi_lpss.c

+ 2 - 1
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) {