Commit 3fe2ec59 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Wolfram Sang
Browse files

i2c: rcar: fix PM ref counts in probe error paths 



We have to take care of ID_P_PM_BLOCKED when bailing out during probe.

Fixes: 7ee24eb5 ("i2c: rcar: disable PM in multi-master mode")
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent e5222d40

drivers/i2c/busses/i2c-rcar.c

+9 −6
Original line number Diff line number Diff line
@@ -1086,8 +1086,10 @@ static int rcar_i2c_probe(struct platform_device *pdev) 
	pm_runtime_enable(dev);

	pm_runtime_get_sync(dev);

	ret = rcar_i2c_clock_calculate(priv);

	if (ret < 0)

		goto out_pm_put;

	if (ret < 0) {

		pm_runtime_put(dev);

		goto out_pm_disable;

	}



	rcar_i2c_write(priv, ICSAR, 0); /* Gen2: must be 0 if not using slave */
@@ -1116,19 +1118,19 @@ static int rcar_i2c_probe(struct platform_device *pdev) 


	ret = platform_get_irq(pdev, 0);

	if (ret < 0)

		goto out_pm_disable;

		goto out_pm_put;

	priv->irq = ret;

	ret = devm_request_irq(dev, priv->irq, irqhandler, irqflags, dev_name(dev), priv);

	if (ret < 0) {

		dev_err(dev, "cannot get irq %d\n", priv->irq);

		goto out_pm_disable;

		goto out_pm_put;

	}



	platform_set_drvdata(pdev, priv);



	ret = i2c_add_numbered_adapter(adap);

	if (ret < 0)

		goto out_pm_disable;

		goto out_pm_put;



	if (priv->flags & ID_P_HOST_NOTIFY) {

		priv->host_notify_client = i2c_new_slave_host_notify_device(adap);
@@ -1145,6 +1147,7 @@ static int rcar_i2c_probe(struct platform_device *pdev) 
 out_del_device:

	i2c_del_adapter(&priv->adap);

 out_pm_put:

	if (priv->flags & ID_P_PM_BLOCKED)

		pm_runtime_put(dev);

 out_pm_disable:

	pm_runtime_disable(dev);