diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 23:05:26 -0400 |
| commit | 91c030b4d6445ebe9fbddb86d584441f300df15c (patch) | |
| tree | e8a48e3ad9e0448c690268175e555fa651983546 /arch/arm/mach-omap2/mailbox.c | |
| parent | 7c3456fdb503071787f7f972de1069b9cacd16f0 (diff) | |
| parent | ae6be51ed01d6c4aaf249a207b4434bc7785853b (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/mach-omap2/mailbox.c')
| -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 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) | |||
| 430 | if (unlikely(!res)) { | 430 | if (unlikely(!res)) { |
| 431 | dev_err(&pdev->dev, "invalid irq resource\n"); | 431 | dev_err(&pdev->dev, "invalid irq resource\n"); |
| 432 | ret = -ENODEV; | 432 | ret = -ENODEV; |
| 433 | goto err_iva1; | 433 | omap_mbox_unregister(&mbox_dsp_info); |
| 434 | goto err_dsp; | ||
| 434 | } | 435 | } |
| 435 | mbox_iva_info.irq = res->start; | 436 | mbox_iva_info.irq = res->start; |
| 436 | ret = omap_mbox_register(&pdev->dev, &mbox_iva_info); | 437 | ret = omap_mbox_register(&pdev->dev, &mbox_iva_info); |
| 437 | if (ret) | 438 | if (ret) { |
| 438 | goto err_iva1; | 439 | omap_mbox_unregister(&mbox_dsp_info); |
| 440 | goto err_dsp; | ||
| 441 | } | ||
| 439 | } | 442 | } |
| 440 | #endif | 443 | #endif |
| 441 | return 0; | 444 | return 0; |
| 442 | 445 | ||
| 443 | err_iva1: | ||
| 444 | omap_mbox_unregister(&mbox_dsp_info); | ||
| 445 | |||
| 446 | err_dsp: | 446 | err_dsp: |
| 447 | iounmap(mbox_base); | 447 | iounmap(mbox_base); |
| 448 | return ret; | 448 | return ret; |