Merge branch 'i2c/for-4.4' into i2c/for-next

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --cc drivers/i2c/busses/i2c-designware-platdrv.c
index c9dc31ae677f736485886f2c614568adbb06c184,190a0d2b94e79edf4208e7d07193918a5762a486..809579ecb5a44fed6745af1274ed46864763651c
--- 1/drivers/i2c/busses/i2c-designware-platdrv.c
--- 2/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@@ -227,8 -207,13 +227,9 @@@ static int dw_i2c_plat_probe(struct pla
        adap = &dev->adapter;
        adap->owner = THIS_MODULE;
        adap->class = I2C_CLASS_DEPRECATED;
+       ACPI_COMPANION_SET(&adap->dev, ACPI_COMPANION(&pdev->dev));
        adap->dev.of_node = pdev->dev.of_node;
  
 -      r = i2c_dw_probe(dev);
 -      if (r)
 -              return r;
 -
        if (dev->pm_runtime_disabled) {
                pm_runtime_forbid(&pdev->dev);
        } else {

diff --cc drivers/i2c/busses/i2c-pnx.c
Simple merge

diff --cc drivers/i2c/i2c-core.c
Simple merge