summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-04-19 13:49:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2023-04-19 13:49:31 -0700
commit23990b1affd2dc8f5e59048d4d4bef05f6e1c544 (patch)
tree688265d746fe6e76eae5c76dd2de45f47fa4f4f3
parent72b4fb4c883d5deac74f5267e486f5dee1bffd5f (diff)
parent359f5b0d4e26b7a7bcc574d6148b31a17cefe47d (diff)
Merge tag 'spi-fix-v6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fix from Mark Brown: "A small fix in the error handling for the rockchip driver, ensuring we don't leak clock enables if we fail to request the interrupt for the device" * tag 'spi-fix-v6.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: spi: spi-rockchip: Fix missing unwind goto in rockchip_sfc_probe()
-rw-r--r--drivers/spi/spi-rockchip-sfc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-rockchip-sfc.c b/drivers/spi/spi-rockchip-sfc.c
index bd87d3c92dd3..69347b6bf60c 100644
--- a/drivers/spi/spi-rockchip-sfc.c
+++ b/drivers/spi/spi-rockchip-sfc.c
@@ -632,7 +632,7 @@ static int rockchip_sfc_probe(struct platform_device *pdev)
if (ret) {
dev_err(dev, "Failed to request irq\n");
- return ret;
+ goto err_irq;
}
ret = rockchip_sfc_init(sfc);