Commit a33642f9 authored Dec 07, 2020 by Lukas Wunner Committed by Greg Kroah-Hartman Dec 30, 2020

spi: sc18is602: Don't leak SPI master in probe error path

commit 5b8c88462d83331dacb48aeaec8388117fef82e0 upstream.

If the call to devm_gpiod_get_optional() fails on probe of the NXP
SC18IS602/603 SPI driver, the spi_master struct is erroneously not freed.

Fix by switching over to the new devm_spi_alloc_master() helper.

Fixes: f9900801 ("spi: sc18is602: Add reset control via gpio pin.")
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Cc: <stable@vger.kernel.org> # v4.9+: 5e844cc37a5c: spi: Introduce device-managed SPI controller allocation
Cc: <stable@vger.kernel.org> # v4.9+
Cc: Phil Reid <preid@electromag.com.au>
Link: https://lore.kernel.org/r/d5f715527b894b91d530fe11a86f51b3184a4e1a.1607286887.git.lukas@wunner.de

Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent e9a04636

drivers/spi/spi-sc18is602.c

+2 −11

Original line number	Diff line number	Diff line
		@@ -248,13 +248,12 @@ static int sc18is602_probe(struct i2c_client *client,
		struct sc18is602_platform_data *pdata = dev_get_platdata(dev);
		struct sc18is602 *hw;
		struct spi_master *master;
		int error;

		if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C \|
		I2C_FUNC_SMBUS_WRITE_BYTE_DATA))
		return -EINVAL;

		master = spi_alloc_master(dev, sizeof(struct sc18is602));
		master = devm_spi_alloc_master(dev, sizeof(struct sc18is602));
		if (!master)
		return -ENOMEM;

		@@ -308,15 +307,7 @@ static int sc18is602_probe(struct i2c_client *client,
		master->min_speed_hz = hw->freq / 128;
		master->max_speed_hz = hw->freq / 4;

		error = devm_spi_register_master(dev, master);
		if (error)
		goto error_reg;

		return 0;

		error_reg:
		spi_master_put(master);
		return error;
		return devm_spi_register_master(dev, master);
		}

		static const struct i2c_device_id sc18is602_id[] = {