Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / usb / phy / phy-mxs-usb.c

diff --git a/drivers/usb/phy/phy-mxs-usb.c b/drivers/usb/phy/phy-mxs-usb.c
index 9aef6ca162fed1c020c658cfa93870449ffd989e..b9589f6636832ce3255178be31b9a3d46bb6884c 100644 (file)
--- a/drivers/usb/phy/phy-mxs-usb.c
+++ b/drivers/usb/phy/phy-mxs-usb.c
@@ -390,10 +390,8 @@ static int mxs_phy_probe(struct platform_device *pdev)
        }
 
        mxs_phy = devm_kzalloc(&pdev->dev, sizeof(*mxs_phy), GFP_KERNEL);
-       if (!mxs_phy) {
-               dev_err(&pdev->dev, "Failed to allocate USB PHY structure!\n");
+       if (!mxs_phy)
                return -ENOMEM;
-       }
 
        /* Some SoCs don't have anatop registers */
        if (of_get_property(np, "fsl,anatop", NULL)) {