2011-05-16 12:28:20

by Munegowda, Keshava

[permalink] [raw]
Subject: [PATCH v1] mfd: Fix omap_usbhs_alloc_children error handling

From: Axel Lin <[email protected]>

rebased on top of hwmod and runtime pm patch series of usbhs

Signed-off-by: Axel Lin <[email protected]>
Tested-by: Keshava Munegowda <[email protected]>
---
drivers/mfd/omap-usb-host.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
index e1bc3b5..32d19e2 100644
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
@@ -282,6 +282,7 @@ static int omap_usbhs_alloc_children(struct platform_device *pdev)

if (!ehci) {
dev_err(dev, "omap_usbhs_alloc_child failed\n");
+ ret = -ENOMEM;
goto err_end;
}

@@ -305,13 +306,14 @@ static int omap_usbhs_alloc_children(struct platform_device *pdev)
sizeof(*ohci_data), dev);
if (!ohci) {
dev_err(dev, "omap_usbhs_alloc_child failed\n");
+ ret = -ENOMEM;
goto err_ehci;
}

return 0;

err_ehci:
- platform_device_put(ehci);
+ platform_device_unregister(ehci);

err_end:
return ret;
--
1.6.0.4


2011-05-16 12:29:35

by Felipe Balbi

[permalink] [raw]
Subject: Re: [PATCH v1] mfd: Fix omap_usbhs_alloc_children error handling

On Mon, May 16, 2011 at 05:54:07PM +0530, Keshava Munegowda wrote:
> From: Axel Lin <[email protected]>
>
> rebased on top of hwmod and runtime pm patch series of usbhs
>
> Signed-off-by: Axel Lin <[email protected]>
> Tested-by: Keshava Munegowda <[email protected]>

Acked-by: Felipe Balbi <[email protected]>

> ---
> drivers/mfd/omap-usb-host.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c
> index e1bc3b5..32d19e2 100644
> --- a/drivers/mfd/omap-usb-host.c
> +++ b/drivers/mfd/omap-usb-host.c
> @@ -282,6 +282,7 @@ static int omap_usbhs_alloc_children(struct platform_device *pdev)
>
> if (!ehci) {
> dev_err(dev, "omap_usbhs_alloc_child failed\n");
> + ret = -ENOMEM;
> goto err_end;
> }
>
> @@ -305,13 +306,14 @@ static int omap_usbhs_alloc_children(struct platform_device *pdev)
> sizeof(*ohci_data), dev);
> if (!ohci) {
> dev_err(dev, "omap_usbhs_alloc_child failed\n");
> + ret = -ENOMEM;
> goto err_ehci;
> }
>
> return 0;
>
> err_ehci:
> - platform_device_put(ehci);
> + platform_device_unregister(ehci);
>
> err_end:
> return ret;
> --
> 1.6.0.4
>

--
balbi

Attachments:
(No filename) (1.19 kB)
 signature.asc (490.00 B)
Digital signature Download all attachments