diff options
author | Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com> | 2016-04-05 14:07:50 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-04-05 14:51:10 -0400 |
commit | 50ac697baf0c83d5dd34d90acfcd8b83648c2d56 (patch) | |
tree | ae1d97756d894f4cfab43cf17ca8a19959e7fa0d /drivers/spi/spi-cadence.c | |
parent | 24746675fbc8dcc09e10283ca0b3f038e58182e9 (diff) |
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>
Diffstat (limited to 'drivers/spi/spi-cadence.c')
-rw-r--r-- | drivers/spi/spi-cadence.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c index 97a3bf680ccb..2915b257921d 100644 --- a/drivers/spi/spi-cadence.c +++ b/drivers/spi/spi-cadence.c | |||
@@ -527,7 +527,7 @@ static int cdns_spi_probe(struct platform_device *pdev) | |||
527 | if (irq <= 0) { | 527 | if (irq <= 0) { |
528 | ret = -ENXIO; | 528 | ret = -ENXIO; |
529 | dev_err(&pdev->dev, "irq number is invalid\n"); | 529 | dev_err(&pdev->dev, "irq number is invalid\n"); |
530 | goto remove_master; | 530 | goto clk_dis_all; |
531 | } | 531 | } |
532 | 532 | ||
533 | ret = devm_request_irq(&pdev->dev, irq, cdns_spi_irq, | 533 | ret = devm_request_irq(&pdev->dev, irq, cdns_spi_irq, |
@@ -535,7 +535,7 @@ static int cdns_spi_probe(struct platform_device *pdev) | |||
535 | if (ret != 0) { | 535 | if (ret != 0) { |
536 | ret = -ENXIO; | 536 | ret = -ENXIO; |
537 | dev_err(&pdev->dev, "request_irq failed\n"); | 537 | dev_err(&pdev->dev, "request_irq failed\n"); |
538 | goto remove_master; | 538 | goto clk_dis_all; |
539 | } | 539 | } |
540 | 540 | ||
541 | master->prepare_transfer_hardware = cdns_prepare_transfer_hardware; | 541 | master->prepare_transfer_hardware = cdns_prepare_transfer_hardware; |