瀏覽代碼

i2c: axxia: enable clock before calling clk_get_rate()

axxia_i2c_init() uses clk_get_rate() for idev->i2c_clk. clk_get_rate()
should only be called if the clock is enabled, so ensure that by moving
the clk_prepare_enable() call before the call to axxia_i2c_init().

Found by Linux Driver Verification project (linuxtesting.org).

Fixes: 08678b850cd0 ("i2c: axxia: Add I2C driver for AXM55xx")
Signed-off-by: Tobias Jordan <Tobias.Jordan@elektrobit.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Tobias Jordan 7 年之前
父節點
當前提交
e6faa71034
共有 1 個文件被更改,包括 14 次插入12 次删除
  1. 14 12
      drivers/i2c/busses/i2c-axxia.c

+ 14 - 12
drivers/i2c/busses/i2c-axxia.c

@@ -532,23 +532,23 @@ static int axxia_i2c_probe(struct platform_device *pdev)
 	if (idev->bus_clk_rate == 0)
 	if (idev->bus_clk_rate == 0)
 		idev->bus_clk_rate = 100000;	/* default clock rate */
 		idev->bus_clk_rate = 100000;	/* default clock rate */
 
 
+	ret = clk_prepare_enable(idev->i2c_clk);
+	if (ret) {
+		dev_err(&pdev->dev, "failed to enable clock\n");
+		return ret;
+	}
+
 	ret = axxia_i2c_init(idev);
 	ret = axxia_i2c_init(idev);
 	if (ret) {
 	if (ret) {
 		dev_err(&pdev->dev, "failed to initialize\n");
 		dev_err(&pdev->dev, "failed to initialize\n");
-		return ret;
+		goto error_disable_clk;
 	}
 	}
 
 
 	ret = devm_request_irq(&pdev->dev, irq, axxia_i2c_isr, 0,
 	ret = devm_request_irq(&pdev->dev, irq, axxia_i2c_isr, 0,
 			       pdev->name, idev);
 			       pdev->name, idev);
 	if (ret) {
 	if (ret) {
 		dev_err(&pdev->dev, "failed to claim IRQ%d\n", irq);
 		dev_err(&pdev->dev, "failed to claim IRQ%d\n", irq);
-		return ret;
-	}
-
-	ret = clk_prepare_enable(idev->i2c_clk);
-	if (ret) {
-		dev_err(&pdev->dev, "failed to enable clock\n");
-		return ret;
+		goto error_disable_clk;
 	}
 	}
 
 
 	i2c_set_adapdata(&idev->adapter, idev);
 	i2c_set_adapdata(&idev->adapter, idev);
@@ -563,12 +563,14 @@ static int axxia_i2c_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, idev);
 	platform_set_drvdata(pdev, idev);
 
 
 	ret = i2c_add_adapter(&idev->adapter);
 	ret = i2c_add_adapter(&idev->adapter);
-	if (ret) {
-		clk_disable_unprepare(idev->i2c_clk);
-		return ret;
-	}
+	if (ret)
+		goto error_disable_clk;
 
 
 	return 0;
 	return 0;
+
+error_disable_clk:
+	clk_disable_unprepare(idev->i2c_clk);
+	return ret;
 }
 }
 
 
 static int axxia_i2c_remove(struct platform_device *pdev)
 static int axxia_i2c_remove(struct platform_device *pdev)