From: Shubhrajyoti Datta <shubhrajyoti.datta-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
To: <linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Cc: <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
<broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
Shubhrajyoti Datta
<shubhraj-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
Subject: [PATCH 3/7] spi: cadence: Fix probe error handling
Date: Tue, 5 Apr 2016 23:37:50 +0530 [thread overview]
Message-ID: <1459879674-13012-3-git-send-email-shubhraj@xilinx.com> (raw)
In-Reply-To: <1459879674-13012-1-git-send-email-shubhraj-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
The clock disabling is missed out in some
error cases at probe. Fix the same.
Signed-off-by: Shubhrajyoti Datta <shubhraj-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
---
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 97a3bf6..2915b25 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)
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 @@ static int cdns_spi_probe(struct platform_device *pdev)
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;
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-04-05 18:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-05 18:07 [PATCH 1/7] spi: cadence: Fix a check patch warning Shubhrajyoti Datta
2016-04-05 18:07 ` [PATCH 2/7] spi: cadence: Remove _MASK and _OFFSET suffix Shubhrajyoti Datta
[not found] ` <1459879674-13012-2-git-send-email-shubhraj-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2016-04-05 18:51 ` Applied "spi: cadence: Remove _MASK and _OFFSET suffix" to the spi tree Mark Brown
[not found] ` <1459879674-13012-1-git-send-email-shubhraj-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2016-04-05 18:07 ` Shubhrajyoti Datta [this message]
[not found] ` <1459879674-13012-3-git-send-email-shubhraj-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2016-04-05 18:51 ` Applied "spi: cadence: Fix probe error handling" " Mark Brown
2016-04-05 18:07 ` [PATCH 4/7] spi: cadance: Fix the Documentation Shubhrajyoti Datta
[not found] ` <1459879674-13012-4-git-send-email-shubhraj-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2016-04-05 18:51 ` Applied "spi: cadance: Fix the Documentation" to the spi tree Mark Brown
2016-04-05 18:07 ` [PATCH 6/7] spi: cadence: Remove the clock enable and disable from suspend and resume Shubhrajyoti Datta
[not found] ` <1459879674-13012-6-git-send-email-shubhraj-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2016-04-05 18:51 ` Applied "spi: cadence: Remove the clock enable and disable from suspend and resume" to the spi tree Mark Brown
2016-04-05 18:51 ` Applied "spi: cadence: Fix a check patch warning" " Mark Brown
2016-04-05 18:07 ` [PATCH 5/7] spi: cadence: Runtime pm adaptation Shubhrajyoti Datta
[not found] ` <1459879674-13012-5-git-send-email-shubhraj-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2016-04-05 18:51 ` Applied "spi: cadence: Runtime pm adaptation" to the spi tree Mark Brown
2016-04-05 18:07 ` [PATCH 7/7] spi: cadence: Return the error code for cdns_spi_suspend and cdns_spi_resume Shubhrajyoti Datta
[not found] ` <1459879674-13012-7-git-send-email-shubhraj-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2016-04-05 18:51 ` Applied "spi: cadence: Return the error code for cdns_spi_suspend and cdns_spi_resume" to the spi tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459879674-13012-3-git-send-email-shubhraj@xilinx.com \
--to=shubhrajyoti.datta-gjffaj9ahvfqt0dzr+alfa@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=shubhraj-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).