commit 50ac697baf0c83d5dd34d90acfcd8b83648c2d56
author Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> Tue Apr 05 23:37:50 2016 +0530
committer Mark Brown <broonie@kernel.org> Tue Apr 05 11:51:10 2016 -0700
tree ae1d97756d894f4cfab43cf17ca8a19959e7fa0d
parent 24746675fbc8dcc09e10283ca0b3f038e58182e9

spi: cadence: Fix probe error handling

The clock disabling is missed out in some
error cases at probe. Fix the same.

Signed-off-by: Shubhrajyoti Datta <shubhraj@xilinx.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

drivers/spi/spi-cadence.c

diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c
index 97a3bf6..2915b25 100644
--- a/drivers/spi/spi-cadence.c
+++ b/drivers/spi/spi-cadence.c
@@ -527,7 +527,7 @@
 	if (irq <= 0) {
 		ret = -ENXIO;
 		dev_err(&pdev->dev, "irq number is invalid\n");
-		goto remove_master;
+		goto clk_dis_all;
 	}
 
 	ret = devm_request_irq(&pdev->dev, irq, cdns_spi_irq,
@@ -535,7 +535,7 @@
 	if (ret != 0) {
 		ret = -ENXIO;
 		dev_err(&pdev->dev, "request_irq failed\n");
-		goto remove_master;
+		goto clk_dis_all;
 	}
 
 	master->prepare_transfer_hardware = cdns_prepare_transfer_hardware;