Merge branch 'getname2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / drivers / phy / phy-armada375-usb2.c

diff --git a/drivers/phy/phy-armada375-usb2.c b/drivers/phy/phy-armada375-usb2.c
index ac7d99d..7c99ca2 100644 (file)
--- a/drivers/phy/phy-armada375-usb2.c
+++ b/drivers/phy/phy-armada375-usb2.c
@@ -118,8 +118,8 @@ static int armada375_usb_phy_probe(struct platform_device *pdev)
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        usb_cluster_base = devm_ioremap_resource(&pdev->dev, res);
-       if (!usb_cluster_base)
-               return -ENOMEM;
+       if (IS_ERR(usb_cluster_base))
+               return PTR_ERR(usb_cluster_base);
 
        phy = devm_phy_create(dev, NULL, &armada375_usb_phy_ops);
        if (IS_ERR(phy)) {