1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index e75737fd7eef..02e835f3cf8a 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -125,7 +125,7 @@ static struct lpss_device_desc lpt_dev_desc = {
 };
 
 static struct lpss_device_desc lpt_i2c_dev_desc = {
-        .flags = LPSS_CLK | LPSS_CLK_GATE | LPSS_LTR,
+        .flags = LPSS_CLK | LPSS_LTR,
         .prv_offset = 0x800,
 };
 
@@ -307,7 +307,7 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
 {
         struct lpss_device_desc *dev_desc;
         struct lpss_private_data *pdata;
-        struct resource_list_entry *rentry;
+        struct resource_entry *rentry;
         struct list_head resource_list;
         struct platform_device *pdev;
         int ret;
@@ -327,13 +327,15 @@ static int acpi_lpss_create_device(struct acpi_device *adev,
                 goto err_out;
 
         list_for_each_entry(rentry, &resource_list, node)
-                if (resource_type(&rentry->res) == IORESOURCE_MEM) {
+                if (resource_type(rentry->res) == IORESOURCE_MEM) {
                         if (dev_desc->prv_size_override)
                                 pdata->mmio_size = dev_desc->prv_size_override;
                         else
-                                pdata->mmio_size = resource_size(&rentry->res);
-                        pdata->mmio_base = ioremap(rentry->res.start,
+                                pdata->mmio_size = resource_size(rentry->res);
+                        pdata->mmio_base = ioremap(rentry->res->start,
                                                    pdata->mmio_size);
+                        if (!pdata->mmio_base)
+                                goto err_out;
                         break;
                 }