Commit ceb013b2 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Wolfram Sang
Browse files

i2c: i801: Avoid potential double call to gpiod_remove_lookup_table 



If registering the platform device fails, the lookup table is
removed in the error path. On module removal we would try to
remove the lookup table again. Fix this by setting priv->lookup
only if registering the platform device was successful.
In addition free the memory allocated for the lookup table in
the error path.

Fixes: d308dfbf ("i2c: mux/i801: Switch to use descriptor passing")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarAndi Shyti <andi.shyti@kernel.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarAndi Shyti <andi.shyti@kernel.org>
parent 09f02902

drivers/i2c/busses/i2c-i801.c

+3 −1
Original line number Diff line number Diff line
@@ -1416,7 +1416,6 @@ static void i801_add_mux(struct i801_priv *priv) 
		lookup->table[i] = GPIO_LOOKUP(mux_config->gpio_chip,

					       mux_config->gpios[i], "mux", 0);

	gpiod_add_lookup_table(lookup);

	priv->lookup = lookup;



	/*

	 * Register the mux device, we use PLATFORM_DEVID_NONE here
@@ -1430,7 +1429,10 @@ static void i801_add_mux(struct i801_priv *priv) 
				sizeof(struct i2c_mux_gpio_platform_data));

	if (IS_ERR(priv->mux_pdev)) {

		gpiod_remove_lookup_table(lookup);

		devm_kfree(dev, lookup);

		dev_err(dev, "Failed to register i2c-mux-gpio device\n");

	} else {

		priv->lookup = lookup;

	}

}