* [PATCH 1/5 v2] omap2/3/4: mailbox: remove compiler warning
@ 2010-02-23 16:00 Anna, Suman
2010-02-25 22:34 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Anna, Suman @ 2010-02-23 16:00 UTC (permalink / raw)
To: linux-omap@vger.kernel.org
Cc: Tony Lindgren, Hiroshi.DOYU@nokia.com, Shilimkar, Santosh,
Ramirez Luna, Omar
>From 02c45559105c62343e31226fe67117231ea10c35 Mon Sep 17 00:00:00 2001
From: Suman Anna <s-anna@ti.com>
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@ti.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/5 v2] omap2/3/4: mailbox: remove compiler warning
2010-02-23 16:00 [PATCH 1/5 v2] omap2/3/4: mailbox: remove compiler warning Anna, Suman
@ 2010-02-25 22:34 ` Tony Lindgren
2010-03-01 7:00 ` Hiroshi DOYU
0 siblings, 1 reply; 3+ messages in thread
From: Tony Lindgren @ 2010-02-25 22:34 UTC (permalink / raw)
To: Anna, Suman
Cc: linux-omap@vger.kernel.org, Hiroshi.DOYU@nokia.com,
Shilimkar, Santosh, Ramirez Luna, Omar
* Anna, Suman <s-anna@ti.com> [100223 07:57]:
> From 02c45559105c62343e31226fe67117231ea10c35 Mon Sep 17 00:00:00 2001
> From: Suman Anna <s-anna@ti.com>
> 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@ti.com>
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/5 v2] omap2/3/4: mailbox: remove compiler warning
2010-02-25 22:34 ` Tony Lindgren
@ 2010-03-01 7:00 ` Hiroshi DOYU
0 siblings, 0 replies; 3+ messages in thread
From: Hiroshi DOYU @ 2010-03-01 7:00 UTC (permalink / raw)
To: tony; +Cc: s-anna, linux-omap, santosh.shilimkar, omar.ramirez
From: ext Tony Lindgren <tony@atomide.com>
Subject: Re: [PATCH 1/5 v2] omap2/3/4: mailbox: remove compiler warning
Date: Thu, 25 Feb 2010 23:34:14 +0100
> * Anna, Suman <s-anna@ti.com> [100223 07:57]:
>> From 02c45559105c62343e31226fe67117231ea10c35 Mon Sep 17 00:00:00 2001
>> From: Suman Anna <s-anna@ti.com>
>> 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@ti.com>
>
> Hiroshi, do you want me to queue this? If so, please respond
> with your ack.
OK for me. In any case, these should be revisited later.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-01 7:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-23 16:00 [PATCH 1/5 v2] omap2/3/4: mailbox: remove compiler warning Anna, Suman
2010-02-25 22:34 ` Tony Lindgren
2010-03-01 7:00 ` Hiroshi DOYU
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.