Commit 3c3dd56f authored by Alain Volmat's avatar Alain Volmat Committed by Wolfram Sang
Browse files

i2c: fix missing pm_runtime_put_sync in i2c_device_probe 



In case of the I2C client exposes the flag I2C_CLIENT_HOST_NOTIFY,
pm_runtime_get_sync is called in order to always keep active the
adapter. However later on, pm_runtime_put_sync is never called
within the function in case of an error. This commit add this
error handling.

Fixes: 72bfcee1 ("i2c: Prevent runtime suspend of adapter when Host Notify is required")
Signed-off-by: default avatarAlain Volmat <alain.volmat@st.com>
Reviewed-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 0e698dfa

drivers/i2c/i2c-core-base.c

+16 −6
Original line number Diff line number Diff line
@@ -338,8 +338,10 @@ static int i2c_device_probe(struct device *dev) 
		} else if (ACPI_COMPANION(dev)) {

			irq = i2c_acpi_get_irq(client);

		}

		if (irq == -EPROBE_DEFER)

			return irq;

		if (irq == -EPROBE_DEFER) {

			status = irq;

			goto put_sync_adapter;

		}



		if (irq < 0)

			irq = 0;
@@ -353,15 +355,19 @@ static int i2c_device_probe(struct device *dev) 
	 */

	if (!driver->id_table &&

	    !i2c_acpi_match_device(dev->driver->acpi_match_table, client) &&

	    !i2c_of_match_device(dev->driver->of_match_table, client))

		return -ENODEV;

	    !i2c_of_match_device(dev->driver->of_match_table, client)) {

		status = -ENODEV;

		goto put_sync_adapter;

	}



	if (client->flags & I2C_CLIENT_WAKE) {

		int wakeirq;



		wakeirq = of_irq_get_byname(dev->of_node, "wakeup");

		if (wakeirq == -EPROBE_DEFER)

			return wakeirq;

		if (wakeirq == -EPROBE_DEFER) {

			status = wakeirq;

			goto put_sync_adapter;

		}



		device_init_wakeup(&client->dev, true);
@@ -408,6 +414,10 @@ static int i2c_device_probe(struct device *dev) 
err_clear_wakeup_irq:

	dev_pm_clear_wake_irq(&client->dev);

	device_init_wakeup(&client->dev, false);

put_sync_adapter:

	if (client->flags & I2C_CLIENT_HOST_NOTIFY)

		pm_runtime_put_sync(&client->adapter->dev);



	return status;

}