Merge tag 'edac/v3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[mirror_ubuntu-artful-kernel.git] / drivers / phy / phy-omap-usb2.c

diff --git a/drivers/phy/phy-omap-usb2.c b/drivers/phy/phy-omap-usb2.c
index 93d78359246c82c815418df9fc3aec0f1f11f5c7..8c842980834a2cebb40a77d31bc30f5f6ed643ae 100644 (file)
--- a/drivers/phy/phy-omap-usb2.c
+++ b/drivers/phy/phy-omap-usb2.c
@@ -212,16 +212,12 @@ static int omap_usb2_probe(struct platform_device *pdev)
        phy_data = (struct usb_phy_data *)of_id->data;
 
        phy = devm_kzalloc(&pdev->dev, sizeof(*phy), GFP_KERNEL);
-       if (!phy) {
-               dev_err(&pdev->dev, "unable to allocate memory for USB2 PHY\n");
+       if (!phy)
                return -ENOMEM;
-       }
 
        otg = devm_kzalloc(&pdev->dev, sizeof(*otg), GFP_KERNEL);
-       if (!otg) {
-               dev_err(&pdev->dev, "unable to allocate memory for USB OTG\n");
+       if (!otg)
                return -ENOMEM;
-       }
 
        phy->dev                = &pdev->dev;
 
@@ -382,7 +378,6 @@ static struct platform_driver omap_usb2_driver = {
        .remove         = omap_usb2_remove,
        .driver         = {
                .name   = "omap-usb2",
-               .owner  = THIS_MODULE,
                .pm     = DEV_PM_OPS,
                .of_match_table = of_match_ptr(omap_usb2_id_table),
        },