Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[linux-2.6-block.git] / drivers / mailbox / mailbox-sti.c

diff --git a/drivers/mailbox/mailbox-sti.c b/drivers/mailbox/mailbox-sti.c
index 2394cfe892b684c4f7d002f9c488a02f85daa54e..a334db5c9f1c126939873555671302b97ebecae9 100644 (file)
--- a/drivers/mailbox/mailbox-sti.c
+++ b/drivers/mailbox/mailbox-sti.c
@@ -430,8 +430,8 @@ static int sti_mbox_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        mdev->base = devm_ioremap_resource(&pdev->dev, res);
-       if (!mdev->base)
-               return -ENOMEM;
+       if (IS_ERR(mdev->base))
+               return PTR_ERR(mdev->base);
 
        ret = of_property_read_string(np, "mbox-name", &mdev->name);
        if (ret)