diff options
Diffstat (limited to 'drivers/net/depca.c')
-rw-r--r-- | drivers/net/depca.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/depca.c b/drivers/net/depca.c index 5113eef755b9..183497020bfc 100644 --- a/drivers/net/depca.c +++ b/drivers/net/depca.c | |||
@@ -1044,7 +1044,6 @@ static int depca_rx(struct net_device *dev) | |||
1044 | unsigned char *buf; | 1044 | unsigned char *buf; |
1045 | skb_reserve(skb, 2); /* 16 byte align the IP header */ | 1045 | skb_reserve(skb, 2); /* 16 byte align the IP header */ |
1046 | buf = skb_put(skb, pkt_len); | 1046 | buf = skb_put(skb, pkt_len); |
1047 | skb->dev = dev; | ||
1048 | if (entry < lp->rx_old) { /* Wrapped buffer */ | 1047 | if (entry < lp->rx_old) { /* Wrapped buffer */ |
1049 | len = (lp->rxRingMask - lp->rx_old + 1) * RX_BUFF_SZ; | 1048 | len = (lp->rxRingMask - lp->rx_old + 1) * RX_BUFF_SZ; |
1050 | memcpy_fromio(buf, lp->rx_buff[lp->rx_old], len); | 1049 | memcpy_fromio(buf, lp->rx_buff[lp->rx_old], len); |
@@ -1491,8 +1490,9 @@ static void __init depca_platform_probe (void) | |||
1491 | depca_io_ports[i].device = pldev; | 1490 | depca_io_ports[i].device = pldev; |
1492 | 1491 | ||
1493 | if (platform_device_add(pldev)) { | 1492 | if (platform_device_add(pldev)) { |
1494 | platform_device_put(pldev); | ||
1495 | depca_io_ports[i].device = NULL; | 1493 | depca_io_ports[i].device = NULL; |
1494 | pldev->dev.platform_data = NULL; | ||
1495 | platform_device_put(pldev); | ||
1496 | continue; | 1496 | continue; |
1497 | } | 1497 | } |
1498 | 1498 | ||