Commit cd948962 authored by Shuai Jiang's avatar Shuai Jiang Committed by Wolfram Sang
Browse files

i2c: qup: Add missing unwind goto in qup_i2c_probe() 



Smatch Warns:
	drivers/i2c/busses/i2c-qup.c:1784 qup_i2c_probe()
	warn: missing unwind goto?

The goto label "fail_runtime" and "fail" will disable qup->pclk,
but here qup->pclk failed to obtain, in order to be consistent,
change the direct return to goto label "fail_dma".

Fixes: 9cedf3b2 ("i2c: qup: Add bam dma capabilities")
Signed-off-by: default avatarShuai Jiang <d202180596@hust.edu.cn>
Reviewed-by: default avatarDongliang Mu <dzm91@hust.edu.cn>
Reviewed-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
Cc: <stable@vger.kernel.org> # v4.6+
parent bd5c7104

drivers/i2c/busses/i2c-qup.c

+14 −7
Original line number Diff line number Diff line
@@ -1752,16 +1752,21 @@ static int qup_i2c_probe(struct platform_device *pdev) 
	if (!clk_freq || clk_freq > I2C_MAX_FAST_MODE_PLUS_FREQ) {

		dev_err(qup->dev, "clock frequency not supported %d\n",

			clk_freq);

		return -EINVAL;

		ret = -EINVAL;

		goto fail_dma;

	}



	qup->base = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(qup->base))

		return PTR_ERR(qup->base);

	if (IS_ERR(qup->base)) {

		ret = PTR_ERR(qup->base);

		goto fail_dma;

	}



	qup->irq = platform_get_irq(pdev, 0);

	if (qup->irq < 0)

		return qup->irq;

	if (qup->irq < 0) {

		ret = qup->irq;

		goto fail_dma;

	}



	if (has_acpi_companion(qup->dev)) {

		ret = device_property_read_u32(qup->dev,
@@ -1775,13 +1780,15 @@ static int qup_i2c_probe(struct platform_device *pdev) 
		qup->clk = devm_clk_get(qup->dev, "core");

		if (IS_ERR(qup->clk)) {

			dev_err(qup->dev, "Could not get core clock\n");

			return PTR_ERR(qup->clk);

			ret = PTR_ERR(qup->clk);

			goto fail_dma;

		}



		qup->pclk = devm_clk_get(qup->dev, "iface");

		if (IS_ERR(qup->pclk)) {

			dev_err(qup->dev, "Could not get iface clock\n");

			return PTR_ERR(qup->pclk);

			ret = PTR_ERR(qup->pclk);

			goto fail_dma;

		}

		qup_i2c_enable_clocks(qup);

		src_clk_freq = clk_get_rate(qup->clk);