diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-07 18:59:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-07 18:59:38 -0400 |
| commit | 597e608a8492d662736c9bc6aa507dbf1cadc17d (patch) | |
| tree | 6c330cdd0a4809f67dd191b37e34f5b4318cef78 /drivers/net/cpmac.c | |
| parent | acbc0f039ff4b93da737c91937b7c70018ded39f (diff) | |
| parent | 33b665eeeb85956ccbdf31c4c31a4e2a31133c44 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/cpmac.c')
| -rw-r--r-- | drivers/net/cpmac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index 1756d28250d4..38de1a4f825f 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c | |||
| @@ -1181,7 +1181,8 @@ static int __devinit cpmac_probe(struct platform_device *pdev) | |||
| 1181 | if (netif_msg_drv(priv)) | 1181 | if (netif_msg_drv(priv)) |
| 1182 | printk(KERN_ERR "%s: Could not attach to PHY\n", | 1182 | printk(KERN_ERR "%s: Could not attach to PHY\n", |
| 1183 | dev->name); | 1183 | dev->name); |
| 1184 | return PTR_ERR(priv->phy); | 1184 | rc = PTR_ERR(priv->phy); |
| 1185 | goto fail; | ||
| 1185 | } | 1186 | } |
| 1186 | 1187 | ||
| 1187 | if ((rc = register_netdev(dev))) { | 1188 | if ((rc = register_netdev(dev))) { |