aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/sun/sunvnet.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/sun/sunvnet.c')
-rw-r--r--drivers/net/ethernet/sun/sunvnet.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c
index 8c6c059f3489..2896f6e9672b 100644
--- a/drivers/net/ethernet/sun/sunvnet.c
+++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -949,10 +949,9 @@ static int __devinit vnet_port_alloc_tx_bufs(struct vnet_port *port)
949 int map_len = (ETH_FRAME_LEN + 7) & ~7; 949 int map_len = (ETH_FRAME_LEN + 7) & ~7;
950 950
951 err = -ENOMEM; 951 err = -ENOMEM;
952 if (!buf) { 952 if (!buf)
953 pr_err("TX buffer allocation failure\n");
954 goto err_out; 953 goto err_out;
955 } 954
956 err = -EFAULT; 955 err = -EFAULT;
957 if ((unsigned long)buf & (8UL - 1)) { 956 if ((unsigned long)buf & (8UL - 1)) {
958 pr_err("TX buffer misaligned\n"); 957 pr_err("TX buffer misaligned\n");
@@ -1165,10 +1164,8 @@ static int __devinit vnet_port_probe(struct vio_dev *vdev,
1165 1164
1166 port = kzalloc(sizeof(*port), GFP_KERNEL); 1165 port = kzalloc(sizeof(*port), GFP_KERNEL);
1167 err = -ENOMEM; 1166 err = -ENOMEM;
1168 if (!port) { 1167 if (!port)
1169 pr_err("Cannot allocate vnet_port\n");
1170 goto err_out_put_mdesc; 1168 goto err_out_put_mdesc;
1171 }
1172 1169
1173 for (i = 0; i < ETH_ALEN; i++) 1170 for (i = 0; i < ETH_ALEN; i++)
1174 port->raddr[i] = (*rmac >> (5 - i) * 8) & 0xff; 1171 port->raddr[i] = (*rmac >> (5 - i) * 8) & 0xff;