Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[lisovros/linux_canprio.git] / drivers / net / ethernet / ti / cpmac.c

diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c
index cbc8df78d84bf65ab45668b5b585bf1bd5d11d7f..860c2526f08d0dd470b777756ca4db1d93094a62 100644 (file)
--- a/drivers/net/ethernet/ti/cpmac.c
+++ b/drivers/net/ethernet/ti/cpmac.c
@@ -1143,11 +1143,8 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
        }
 
        dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);
-
-       if (!dev) {
-               printk(KERN_ERR "cpmac: Unable to allocate net_device\n");
+       if (!dev)
                return -ENOMEM;
-       }
 
        platform_set_drvdata(pdev, dev);
        priv = netdev_priv(dev);