From: Wolfram Sang <wsa@kernel.org>
Date: Wed, 20 May 2020 13:27:45 +0000 (+0200)
Subject: Merge branch 'i2c/for-current-fixed' into i2c/for-5.8
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f89c326dcaa0cb8c3af7764e75eeed4e3f3c879a;p=linux.git

Merge branch 'i2c/for-current-fixed' into i2c/for-5.8
---

f89c326dcaa0cb8c3af7764e75eeed4e3f3c879a
diff --cc drivers/i2c/busses/i2c-altera.c
index 027faabe3d043,16ddc26c00e65..70c81f88b293f
--- a/drivers/i2c/busses/i2c-altera.c
+++ b/drivers/i2c/busses/i2c-altera.c
@@@ -382,8 -389,8 +389,7 @@@ static const struct i2c_algorithm altr_
  static int altr_i2c_probe(struct platform_device *pdev)
  {
  	struct altr_i2c_dev *idev = NULL;
 -	struct resource *res;
  	int irq, ret;
- 	u32 val;
  
  	idev = devm_kzalloc(&pdev->dev, sizeof(*idev), GFP_KERNEL);
  	if (!idev)