summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/spi-nor/cadence-quadspi.c
diff options
context:
space:
mode:
authorVignesh R2017-10-03 07:19:24 +0200
committerCyrille Pitchen2017-10-17 20:41:19 +0200
commit329864d35a7f49bed78bc3302fc56317c325f31f (patch)
tree00c97802f5697b862d45704e63a4a35ec8bf328f /drivers/mtd/spi-nor/cadence-quadspi.c
parentmtd: spi-nor: cadence-quadspi: Add support to enable loop-back clock circuit (diff)
downloadkernel-qcow2-linux-329864d35a7f49bed78bc3302fc56317c325f31f.tar.gz
kernel-qcow2-linux-329864d35a7f49bed78bc3302fc56317c325f31f.tar.xz
kernel-qcow2-linux-329864d35a7f49bed78bc3302fc56317c325f31f.zip
mtd: spi-nor: cadence-quadspi: Fix error path in probe
Fix the reversed goto labels, so that we disable cqspi controller only if its enabled previously. This is a minor cleanup. Signed-off-by: Vignesh R <vigneshr@ti.com> Acked-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Cyrille Pitchen <cyrille.pitchen@wedev4u.fr>
Diffstat (limited to 'drivers/mtd/spi-nor/cadence-quadspi.c')
-rw-r--r--drivers/mtd/spi-nor/cadence-quadspi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c
index d9629e8f4798..60b557e00cfb 100644
--- a/drivers/mtd/spi-nor/cadence-quadspi.c
+++ b/drivers/mtd/spi-nor/cadence-quadspi.c
@@ -1255,9 +1255,9 @@ static int cqspi_probe(struct platform_device *pdev)
}
return ret;
-probe_irq_failed:
- cqspi_controller_enable(cqspi, 0);
probe_setup_failed:
+ cqspi_controller_enable(cqspi, 0);
+probe_irq_failed:
clk_disable_unprepare(cqspi->clk);
return ret;
}