Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux.git] / drivers / mailbox / omap-mailbox.c

diff --git a/drivers/mailbox/omap-mailbox.c b/drivers/mailbox/omap-mailbox.c
index a3cd63583cf732a4f8c2338b0dc03546fe8d92d9..5978a35aac6d092b55ca659fb7e0f76fdfb6dcaf 100644 (file)
--- a/drivers/mailbox/omap-mailbox.c
+++ b/drivers/mailbox/omap-mailbox.c
@@ -868,7 +868,7 @@ static int omap_mbox_probe(struct platform_device *pdev)
        dev_info(mdev->dev, "omap mailbox rev 0x%x\n", l);
 
        ret = pm_runtime_put_sync(mdev->dev);
-       if (ret < 0)
+       if (ret < 0 && ret != -ENOSYS)
                goto unregister;
 
        devm_kfree(&pdev->dev, finfoblk);