From patchwork Thu Nov 24 08:24:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krishna Kumar X-Patchwork-Id: 127452 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B34921007D7 for ; Thu, 24 Nov 2011 19:24:36 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753451Ab1KXIYb (ORCPT ); Thu, 24 Nov 2011 03:24:31 -0500 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:58425 "EHLO e23smtp01.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753334Ab1KXIYb (ORCPT ); Thu, 24 Nov 2011 03:24:31 -0500 Received: from /spool/local by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 24 Nov 2011 08:20:26 +1000 Received: from d23relay04.au.ibm.com ([202.81.31.246]) by e23smtp01.au.ibm.com ([202.81.31.207]) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 24 Nov 2011 08:20:24 +1000 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id pAO8L8Tx1388558 for ; Thu, 24 Nov 2011 19:21:08 +1100 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id pAO8ONc1002266 for ; Thu, 24 Nov 2011 19:24:25 +1100 Received: from krkumar2.in.ibm.com ([9.79.219.129]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id pAO8OLfu002058; Thu, 24 Nov 2011 19:24:22 +1100 From: Krishna Kumar To: rusty@rustcorp.com.au, mst@redhat.com Cc: netdev@vger.kernel.org, levinsasha928@gmail.com, Krishna Kumar , davem@davemloft.net Date: Thu, 24 Nov 2011 13:54:21 +0530 Message-Id: <20111124082421.26821.71126.sendpatchset@krkumar2.in.ibm.com> Subject: [PATCH] virtio_net: Give indication on device probe failure. x-cbid: 11112322-1618-0000-0000-000000279E7D Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Provide an indication when the virtio_net device fails to initialize. Signed-off-by: Krishna Kumar --- drivers/net/virtio_net.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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; }