summaryrefslogtreecommitdiffstats
path: root/drivers/spi
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2017-02-19 14:19:02 +0100
committerMark Brown <broonie@kernel.org>2017-02-19 16:39:21 +0000
commitfbad6c24396b265d4e19cc78aef9b1c7e7e6de64 (patch)
tree6ff7abd45df843ad8f607c28463638297674f264 /drivers/spi
parentfafd67940774733fa97f4b09412aea6981b82e0a (diff)
downloadlinux-stable-fbad6c24396b265d4e19cc78aef9b1c7e7e6de64.tar.gz
linux-stable-fbad6c24396b265d4e19cc78aef9b1c7e7e6de64.tar.bz2
linux-stable-fbad6c24396b265d4e19cc78aef9b1c7e7e6de64.zip
spi: spi-fsl-dspi: Fix error handling
According to error handling in this function, it is likely that going to 'out_master_put' was expected here. Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi-fsl-dspi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c
index 14c8e7ce1913..15201645bdc4 100644
--- a/drivers/spi/spi-fsl-dspi.c
+++ b/drivers/spi/spi-fsl-dspi.c
@@ -1002,7 +1002,8 @@ static int dspi_probe(struct platform_device *pdev)
if (IS_ERR(dspi->regmap)) {
dev_err(&pdev->dev, "failed to init regmap: %ld\n",
PTR_ERR(dspi->regmap));
- return PTR_ERR(dspi->regmap);
+ ret = PTR_ERR(dspi->regmap);
+ goto out_master_put;
}
dspi_init(dspi);