]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branches 'acpi-ec', 'acpi-soc', 'acpi-video' and 'acpi-resources'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 21 Feb 2015 03:28:56 +0000 (04:28 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 21 Feb 2015 03:28:56 +0000 (04:28 +0100)
* 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

1  2  3  4  5 
drivers/acpi/acpi_lpss.c

index 02e835f3cf8aa76326b9994768b75f2d39c39fed,4f3febf8a58954b2ca8ced8c057106529ab1f30b,6bb8d3574ec68718ca8c17e2f5d32e36a9c5e4a9,4f3febf8a58954b2ca8ced8c057106529ab1f30b,dfd1b8095dadbb6c853dc98e669c21eeeff60bb3..657964e8ab7ed2ba9e56004d5f83881ad826e7b7
@@@@@@ -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;
                }