Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[~shefty/rdma-dev.git] / drivers / net / can / sja1000 / peak_pci.c
index 600ac7226e5ca1da007561bac5e0ffd3eebe5424..d1e7f1006ddd60b1531703d2602f9ca405e9b786 100644 (file)
@@ -450,11 +450,8 @@ static int peak_pciec_probe(struct pci_dev *pdev, struct net_device *dev)
        } else {
                /* create the bit banging I2C adapter structure */
                card = kzalloc(sizeof(struct peak_pciec_card), GFP_KERNEL);
        } else {
                /* create the bit banging I2C adapter structure */
                card = kzalloc(sizeof(struct peak_pciec_card), GFP_KERNEL);
-               if (!card) {
-                       dev_err(&pdev->dev,
-                                "failed allocating memory for i2c chip\n");
+               if (!card)
                        return -ENOMEM;
                        return -ENOMEM;
-               }
 
                card->cfg_base = chan->cfg_base;
                card->reg_base = priv->reg_base;
 
                card->cfg_base = chan->cfg_base;
                card->reg_base = priv->reg_base;