[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20111124082421.26821.71126.sendpatchset@krkumar2.in.ibm.com>
Date: Thu, 24 Nov 2011 13:54:21 +0530
From: Krishna Kumar <krkumar2@...ibm.com>
To: rusty@...tcorp.com.au, mst@...hat.com
Cc: netdev@...r.kernel.org, levinsasha928@...il.com,
Krishna Kumar <krkumar2@...ibm.com>, davem@...emloft.net
Subject: [PATCH] virtio_net: Give indication on device probe failure.
Provide an indication when the virtio_net device fails to
initialize.
Signed-off-by: Krishna Kumar <krkumar2@...ibm.com>
---
drivers/net/virtio_net.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff -ruNp org/drivers/net/virtio_net.c new/drivers/net/virtio_net.c
--- org/drivers/net/virtio_net.c 2011-11-24 11:53:08.000000000 +0530
+++ new/drivers/net/virtio_net.c 2011-11-24 13:51:32.000000000 +0530
@@ -971,7 +971,7 @@ static void virtnet_config_changed(struc
static int virtnet_probe(struct virtio_device *vdev)
{
- int err;
+ int err = -ENOMEM;
struct net_device *dev;
struct virtnet_info *vi;
struct virtqueue *vqs[3];
@@ -982,7 +982,7 @@ static int virtnet_probe(struct virtio_d
/* Allocate ourselves a network device with room for our info */
dev = alloc_etherdev(sizeof(struct virtnet_info));
if (!dev)
- return -ENOMEM;
+ goto out;
/* Set up network device as normal. */
dev->priv_flags |= IFF_UNICAST_FLT;
@@ -1032,7 +1032,6 @@ static int virtnet_probe(struct virtio_d
vdev->priv = vi;
vi->pages = NULL;
vi->stats = alloc_percpu(struct virtnet_stats);
- err = -ENOMEM;
if (vi->stats == NULL)
goto free;
@@ -1104,6 +1103,8 @@ free_stats:
free_percpu(vi->stats);
free:
free_netdev(dev);
+out:
+ dev_err(&vdev->dev, "Device probe failed with errno: %d\n", err);
return err;
}
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists