Re: [PATCH RESEND 3/4] usb: ohci: fix goto wrong tag in err case
On Thu, 9 May 2013, Libo Chen wrote: > fix goto wrong tag in usb_hcd_nxp_probe > > Signed-off-by: Libo Chen > --- > 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(>dev, "USB is disabled\n"); > ret = -ENODEV; > - goto out; > + goto out1; > } Instead of renumbering all these statement labels, it would be better to replace them with names that have a real meaning. That would simplify future fixes. Can you submit a patch to do that instead? Alan Stern -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH RESEND 3/4] usb: ohci: fix goto wrong tag in err case
fix goto wrong tag in usb_hcd_nxp_probe Signed-off-by: Libo Chen --- 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(>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(>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(>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(>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(>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(>dev, "Failed to allocate HC buffer\n"); ret = -ENOMEM; - goto out8; + goto out7; } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH RESEND 3/4] usb: ohci: fix goto wrong tag in err case
fix goto wrong tag in usb_hcd_nxp_probe Signed-off-by: Libo Chen libo.c...@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 -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH RESEND 3/4] usb: ohci: fix goto wrong tag in err case
On Thu, 9 May 2013, Libo Chen wrote: fix goto wrong tag in usb_hcd_nxp_probe Signed-off-by: Libo Chen libo.c...@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; } Instead of renumbering all these statement labels, it would be better to replace them with names that have a real meaning. That would simplify future fixes. Can you submit a patch to do that instead? Alan Stern -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/