From: Libo Chen <libo.chen@huawei.com>
To: <stern@rowland.harvard.edu>, <grant.likely@linaro.org>,
<rob.herring@calxeda.com>
Cc: <linux-usb@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<akpm@linux-foundation.org>, <lizefan@huawei.com>,
Libo Chen <chenlibo.3@gmail.com>,
Libo Chen <libo.chen@huawei.com>
Subject: [PATCH 3/4] usb: ohci: fix goto wrong tag in err case
Date: Thu, 9 May 2013 12:58:10 +0800 [thread overview]
Message-ID: <1368075491-38728-4-git-send-email-libo.chen@huawei.com> (raw)
In-Reply-To: <1368075491-38728-1-git-send-email-libo.chen@huawei.com>
From: Libo Chen <chenlibo.3@gmail.com>
fix goto wrong tag in usb_hcd_nxp_probe
Signed-off-by: Libo Chen <libo.chen@huawei.com>
---
drivers/usb/host/ohci-nxp.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c
index f4988fb..eb294a9 100644
--- a/drivers/usb/host/ohci-nxp.c
+++ b/drivers/usb/host/ohci-nxp.c
@@ -234,7 +234,7 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev)
if (usb_disabled()) {
dev_err(&pdev->dev, "USB is disabled\n");
ret = -ENODEV;
- goto out;
+ goto out1;
}
/* Enable AHB slave USB clock, needed for further USB clock control */
@@ -265,13 +265,13 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev)
if (IS_ERR(usb_dev_clk)) {
dev_err(&pdev->dev, "failed to acquire USB DEV Clock\n");
ret = PTR_ERR(usb_dev_clk);
- goto out4;
+ goto out3;
}
ret = clk_enable(usb_dev_clk);
if (ret < 0) {
dev_err(&pdev->dev, "failed to start USB DEV Clock\n");
- goto out5;
+ goto out4;
}
/* Enable USB otg clocks */
@@ -279,7 +279,7 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev)
if (IS_ERR(usb_otg_clk)) {
dev_err(&pdev->dev, "failed to acquire USB DEV Clock\n");
ret = PTR_ERR(usb_otg_clk);
- goto out6;
+ goto out5;
}
__raw_writel(__raw_readl(USB_CTRL) | USB_HOST_NEED_CLK_EN, USB_CTRL);
@@ -287,7 +287,7 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev)
ret = clk_enable(usb_otg_clk);
if (ret < 0) {
dev_err(&pdev->dev, "failed to start USB DEV Clock\n");
- goto out7;
+ goto out6;
}
isp1301_configure();
@@ -296,7 +296,7 @@ static int usb_hcd_nxp_probe(struct platform_device *pdev)
if (!hcd) {
dev_err(&pdev->dev, "Failed to allocate HC buffer\n");
ret = -ENOMEM;
- goto out8;
+ goto out7;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
--
1.7.1
next prev parent reply other threads:[~2013-05-09 5:02 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-09 4:58 [PATCH 0/4] usb: fix four memleak Libo Chen
2013-05-09 4:58 ` [PATCH 1/4] usb: ehci-s5p: fix memleak when fallback to pdata Libo Chen
2013-05-09 4:58 ` [PATCH 2/4] usb: isp1760-if: fix memleak when platform_get_resource fail Libo Chen
2013-05-09 4:58 ` Libo Chen [this message]
2013-05-17 0:34 ` [PATCH 3/4] usb: ohci: fix goto wrong tag in err case Greg KH
2013-05-09 4:58 ` [PATCH 4/4] usb: tilegx: fix memleak when create hcd fail Libo Chen
2013-05-17 0:34 ` Greg KH
2013-05-17 4:31 ` Libo Chen
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=1368075491-38728-4-git-send-email-libo.chen@huawei.com \
--to=libo.chen@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=chenlibo.3@gmail.com \
--cc=grant.likely@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=rob.herring@calxeda.com \
--cc=stern@rowland.harvard.edu \
/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
Powered by JetHome