Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 45053
b: refs/heads/master
c: ebf5112
h: refs/heads/master
i:
  45051: 8f01708
v: v3
  • Loading branch information
Yan Burman authored and Jeff Garzik committed Dec 26, 2006
1 parent 41e6b45 commit 7b02e5c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3a960f7e350de5d087b88a4c06df236e0f4186fd
refs/heads/master: ebf5112ca7a714a3961a322459747059cbf41d7b
4 changes: 1 addition & 3 deletions trunk/drivers/net/arm/ep93xx_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -780,12 +780,10 @@ static struct ethtool_ops ep93xx_ethtool_ops = {
struct net_device *ep93xx_dev_alloc(struct ep93xx_eth_data *data)
{
struct net_device *dev;
struct ep93xx_priv *ep;

dev = alloc_etherdev(sizeof(struct ep93xx_priv));
if (dev == NULL)
return NULL;
ep = netdev_priv(dev);

memcpy(dev->dev_addr, data->dev_addr, ETH_ALEN);

Expand Down Expand Up @@ -840,9 +838,9 @@ static int ep93xx_eth_probe(struct platform_device *pdev)
struct ep93xx_priv *ep;
int err;

data = pdev->dev.platform_data;
if (pdev == NULL)
return -ENODEV;
data = pdev->dev.platform_data;

dev = ep93xx_dev_alloc(data);
if (dev == NULL) {
Expand Down

0 comments on commit 7b02e5c

Please sign in to comment.