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

[firefly-linux-kernel-4.4.55.git] / drivers / usb / phy / phy-am335x-control.c

diff --git a/drivers/usb/phy/phy-am335x-control.c b/drivers/usb/phy/phy-am335x-control.c
index 460b515cc5cf02e4d2319ac0a092279b168d8c7e..403fab772724825b16ecfd8446ab9d95386bb1cc 100644 (file)
--- a/drivers/usb/phy/phy-am335x-control.c
+++ b/drivers/usb/phy/phy-am335x-control.c
@@ -147,10 +147,8 @@ static int am335x_control_usb_probe(struct platform_device *pdev)
        phy_ctrl = of_id->data;
 
        ctrl_usb = devm_kzalloc(&pdev->dev, sizeof(*ctrl_usb), GFP_KERNEL);
-       if (!ctrl_usb) {
-               dev_err(&pdev->dev, "unable to alloc memory for control usb\n");
+       if (!ctrl_usb)
                return -ENOMEM;
-       }
 
        ctrl_usb->dev = &pdev->dev;