From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 21 Feb 2015 03:28:56 +0000 (+0100)
Subject: Merge branches 'acpi-ec', 'acpi-soc', 'acpi-video' and 'acpi-resources'
X-Git-Tag: v4.0-rc1~9^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9d0de5a63a4a22abfd2bd70694a610d18350cf87;p=linux-2.6-block.git

Merge branches 'acpi-ec', 'acpi-soc', 'acpi-video' and 'acpi-resources'

* acpi-ec:
  ACPI / EC: Remove non-standard log emphasis

* acpi-soc:
  ACPI / LPSS: Deassert resets for SPI host controllers on Braswell
  ACPI / LPSS: Always disable I2C host controllers
  Revert "ACPI / LPSS: Remove non-existing clock control from Intel Lynxpoint I2C"

* acpi-video:
  ACPI / video: Disable native backlight on Samsung Series 9 laptops

* acpi-resources:
  ACPI / resources: Change pr_info() to pr_debug() for debug information
---

9d0de5a63a4a22abfd2bd70694a610d18350cf87
diff --cc drivers/acpi/acpi_lpss.c
index 02e835f3cf8a,4f3febf8a589,6bb8d3574ec6,4f3febf8a589,dfd1b8095dad..657964e8ab7e
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@@@@@ -331,11 -337,9 -346,11 -337,9 -337,9 +346,11 @@@@@@ static int acpi_lpss_create_device(stru
     			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;
     		}