1 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 52a981cb8fdd..318f3638653c 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;