From: Dave Airlie <airlied@redhat.com>
Date: Thu, 23 Mar 2017 02:05:13 +0000 (+1000)
Subject: BackMerge tag 'v4.11-rc3' into drm-next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=65d1086c44791112188f6aebbdc3a27cab3736d3;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

BackMerge tag 'v4.11-rc3' into drm-next

Linux 4.11-rc3 as requested by Daniel
---

65d1086c44791112188f6aebbdc3a27cab3736d3
diff --cc drivers/i2c/busses/i2c-designware-platdrv.c
index df0ff7d82b49,79c4b4ea0539..d8665098dce9
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@@ -235,12 -244,13 +244,13 @@@ static int dw_i2c_plat_probe(struct pla
  	    && dev->clk_freq != 1000000 && dev->clk_freq != 3400000) {
  		dev_err(&pdev->dev,
  			"Only 100kHz, 400kHz, 1MHz and 3.4MHz supported");
- 		return -EINVAL;
+ 		r = -EINVAL;
+ 		goto exit_reset;
  	}
  
 -	r = i2c_dw_eval_lock_support(dev);
 +	r = i2c_dw_probe_lock_support(dev);
  	if (r)
- 		return r;
+ 		goto exit_reset;
  
  	dev->functionality = I2C_FUNC_10BIT_ADDR | DW_IC_DEFAULT_FUNCTIONALITY;
  
@@@ -306,9 -324,9 +324,11 @@@ static int dw_i2c_plat_remove(struct pl
  	pm_runtime_put_sync(&pdev->dev);
  	if (!dev->pm_runtime_disabled)
  		pm_runtime_disable(&pdev->dev);
+ 	if (!IS_ERR_OR_NULL(dev->rst))
+ 		reset_control_assert(dev->rst);
  
 +	i2c_dw_remove_lock_support(dev);
 +
  	return 0;
  }