* Anna, Suman <s-anna@xxxxxx> [100223 07:57]:
> From 02c45559105c62343e31226fe67117231ea10c35 Mon Sep 17 00:00:00 2001
> From: Suman Anna <s-anna@xxxxxx>
> Date: Mon, 25 Jan 2010 18:27:21 -0600
> Subject: [PATCH] omap2/3/4: mailbox: remove compiler warning
>
> Remove a compiler warning in device-specific
> mailbox module.
>
> Signed-off-by: Suman Anna <s-anna@xxxxxx>
Hiroshi, do you want me to queue this? If so, please respond
with your ack.
Tony
> ---
> arch/arm/mach-omap2/mailbox.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
> index 2c9fd1c..a732664 100644
> --- a/arch/arm/mach-omap2/mailbox.c
> +++ b/arch/arm/mach-omap2/mailbox.c
> @@ -409,19 +409,19 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev)
> if (unlikely(!res)) {
> dev_err(&pdev->dev, "invalid irq resource\n");
> ret = -ENODEV;
> - goto err_iva1;
> + omap_mbox_unregister(&mbox_dsp_info);
> + goto err_dsp;
> }
> mbox_iva_info.irq = res->start;
> ret = omap_mbox_register(&pdev->dev, &mbox_iva_info);
> - if (ret)
> - goto err_iva1;
> + if (ret) {
> + omap_mbox_unregister(&mbox_dsp_info);
> + goto err_dsp;
> + }
> }
> #endif
> return 0;
>
> -err_iva1:
> - omap_mbox_unregister(&mbox_dsp_info);
> -
> err_dsp:
> iounmap(mbox_base);
> return ret;
> --
> 1.6.6.2
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
