aboutsummaryrefslogtreecommitdiff
path: root/drivers/spi/spi-gpio.c
diff options
context:
space:
mode:
authorGravatar Mark Brown <broonie@kernel.org> 2019-10-08 19:12:28 +0100
committerGravatar Mark Brown <broonie@kernel.org> 2019-10-08 19:12:28 +0100
commit2b60d727cb2e059e0569b937e742e93423ae1541 (patch)
tree6e16732ab66073675f848df1c98a76b067b60882 /drivers/spi/spi-gpio.c
parentspi: spi-fsl-dspi: Implement the PTP system timestamping for TCFQ mode (diff)
parentspi: spi-fsl-qspi: Clear TDH bits in FLSHCR register (diff)
downloadlinux-2b60d727cb2e059e0569b937e742e93423ae1541.tar.gz
linux-2b60d727cb2e059e0569b937e742e93423ae1541.tar.bz2
linux-2b60d727cb2e059e0569b937e742e93423ae1541.zip
Merge branch 'for-5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.5
Diffstat (limited to 'drivers/spi/spi-gpio.c')
-rw-r--r--drivers/spi/spi-gpio.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index 42f4d82e9c5a..7ceb0ba27b75 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -368,8 +368,10 @@ static int spi_gpio_probe(struct platform_device *pdev)
return -ENOMEM;
status = devm_add_action_or_reset(&pdev->dev, spi_gpio_put, master);
- if (status)
+ if (status) {
+ spi_master_put(master);
return status;
+ }
if (pdev->dev.of_node)
status = spi_gpio_probe_dt(pdev, master);