diff options
Diffstat (limited to 'drivers/net/ethernet/via/via-rhine.c')
| -rw-r--r-- | drivers/net/ethernet/via/via-rhine.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c index 10b18eb63d25..cb2ff28a0602 100644 --- a/drivers/net/ethernet/via/via-rhine.c +++ b/drivers/net/ethernet/via/via-rhine.c | |||
| @@ -927,7 +927,6 @@ static int __devinit rhine_init_one(struct pci_dev *pdev, | |||
| 927 | dev = alloc_etherdev(sizeof(struct rhine_private)); | 927 | dev = alloc_etherdev(sizeof(struct rhine_private)); |
| 928 | if (!dev) { | 928 | if (!dev) { |
| 929 | rc = -ENOMEM; | 929 | rc = -ENOMEM; |
| 930 | dev_err(&pdev->dev, "alloc_etherdev failed\n"); | ||
| 931 | goto err_out; | 930 | goto err_out; |
| 932 | } | 931 | } |
| 933 | SET_NETDEV_DEV(dev, &pdev->dev); | 932 | SET_NETDEV_DEV(dev, &pdev->dev); |
| @@ -1156,7 +1155,6 @@ static void alloc_rbufs(struct net_device *dev) | |||
| 1156 | rp->rx_skbuff[i] = skb; | 1155 | rp->rx_skbuff[i] = skb; |
| 1157 | if (skb == NULL) | 1156 | if (skb == NULL) |
| 1158 | break; | 1157 | break; |
| 1159 | skb->dev = dev; /* Mark as being used by this device. */ | ||
| 1160 | 1158 | ||
| 1161 | rp->rx_skbuff_dma[i] = | 1159 | rp->rx_skbuff_dma[i] = |
| 1162 | pci_map_single(rp->pdev, skb->data, rp->rx_buf_sz, | 1160 | pci_map_single(rp->pdev, skb->data, rp->rx_buf_sz, |
| @@ -1941,7 +1939,6 @@ static int rhine_rx(struct net_device *dev, int limit) | |||
| 1941 | rp->rx_skbuff[entry] = skb; | 1939 | rp->rx_skbuff[entry] = skb; |
| 1942 | if (skb == NULL) | 1940 | if (skb == NULL) |
| 1943 | break; /* Better luck next round. */ | 1941 | break; /* Better luck next round. */ |
| 1944 | skb->dev = dev; /* Mark as being used by this device. */ | ||
| 1945 | rp->rx_skbuff_dma[entry] = | 1942 | rp->rx_skbuff_dma[entry] = |
| 1946 | pci_map_single(rp->pdev, skb->data, | 1943 | pci_map_single(rp->pdev, skb->data, |
| 1947 | rp->rx_buf_sz, | 1944 | rp->rx_buf_sz, |