summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-06 15:39:04 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-06 15:39:04 +0100
commit02c09177d56ef6a0a75ebc681f7667a34edda384 (patch)
tree01f6bedc66427d49725dd9319600f595c71a45f4 /drivers/acpi
parent3df2da96874402722d760e5d4eb2968737e5bb01 (diff)
parentb893e80e314749bce4597a262b7d04e929016e51 (diff)
downloadlinux-02c09177d56ef6a0a75ebc681f7667a34edda384.tar.gz
linux-02c09177d56ef6a0a75ebc681f7667a34edda384.tar.bz2
linux-02c09177d56ef6a0a75ebc681f7667a34edda384.zip
Merge back earlier 'acpi-lpss' material for v3.20
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/acpi_lpss.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index e75737fd7eef..08fbff507dc4 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,
};
@@ -334,6 +334,8 @@ 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);
+ if (!pdata->mmio_base)
+ goto err_out;
break;
}