diff options
| author | Suman Anna <s-anna@ti.com> | 2010-01-25 18:27:21 -0600 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-11 14:50:00 -0800 |
| commit | 26e4248359c6bf2da4a07767f6e12f1df426ab0a (patch) | |
| tree | d230c9590d1af60407a43da56297c1d045cf0f96 /arch/arm | |
| parent | 21b90340207d324f92111e25ead1752533eeb9ca (diff) | |
| download | kernel_samsung_crespo-26e4248359c6bf2da4a07767f6e12f1df426ab0a.zip kernel_samsung_crespo-26e4248359c6bf2da4a07767f6e12f1df426ab0a.tar.gz kernel_samsung_crespo-26e4248359c6bf2da4a07767f6e12f1df426ab0a.tar.bz2 | |
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>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | 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 52a981c..318f363 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c @@ -430,19 +430,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; |