OSDN Git Service

spi: tegra114: set master cleanup and also invoke it on probe error
authorSowjanya Komatineni <skomatineni@nvidia.com>
Thu, 23 May 2019 01:29:04 +0000 (18:29 -0700)
committerMark Brown <broonie@kernel.org>
Thu, 23 May 2019 13:39:46 +0000 (14:39 +0100)
This patch sets master cleanup and also invokes tegra spi clean on
tegra spi probe failure to release tegra spi client data.

Signed-off-by: Sowjanya Komatineni <skomatineni@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-tegra114.c

index 253a7f1..15f9368 100644 (file)
@@ -966,6 +966,8 @@ static int tegra_spi_setup(struct spi_device *spi)
        ret = pm_runtime_get_sync(tspi->dev);
        if (ret < 0) {
                dev_err(tspi->dev, "pm runtime failed, e = %d\n", ret);
+               if (cdata)
+                       tegra_spi_cleanup(spi);
                return ret;
        }
 
@@ -1331,6 +1333,7 @@ static int tegra_spi_probe(struct platform_device *pdev)
                            SPI_TX_DUAL | SPI_RX_DUAL | SPI_3WIRE;
        master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
        master->setup = tegra_spi_setup;
+       master->cleanup = tegra_spi_cleanup;
        master->transfer_one_message = tegra_spi_transfer_one_message;
        master->set_cs_timing = tegra_spi_set_hw_cs_timing;
        master->num_chipselect = MAX_CHIP_SELECT;