| Message ID | 1527732307-145609-1-git-send-email-weiyongjun1@huawei.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] virtio_net: fix error return code in virtnet_probe() | expand |
On 2018年05月31日 10:05, Wei Yongjun wrote: > Fix to return a negative error code from the failover create fail error > handling case instead of 0, as done elsewhere in this function. > > Fixes: ba5e4426e80e ("virtio_net: Extend virtio to use VF datapath when available") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/net/virtio_net.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 8f08a3e..2d55e2a 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -2935,8 +2935,10 @@ static int virtnet_probe(struct virtio_device *vdev) > > if (virtio_has_feature(vdev, VIRTIO_NET_F_STANDBY)) { > vi->failover = net_failover_create(vi->dev); > - if (IS_ERR(vi->failover)) > + if (IS_ERR(vi->failover)) { > + err = PTR_ERR(vi->failover); > goto free_vqs; > + } > } > > err = register_netdev(dev); > Acked-by: Jason Wang <jasowang@redhat.com>
On Thu, May 31, 2018 at 02:05:07AM +0000, Wei Yongjun wrote: > Fix to return a negative error code from the failover create fail error > handling case instead of 0, as done elsewhere in this function. > > Fixes: ba5e4426e80e ("virtio_net: Extend virtio to use VF datapath when available") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > drivers/net/virtio_net.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > index 8f08a3e..2d55e2a 100644 > --- a/drivers/net/virtio_net.c > +++ b/drivers/net/virtio_net.c > @@ -2935,8 +2935,10 @@ static int virtnet_probe(struct virtio_device *vdev) > > if (virtio_has_feature(vdev, VIRTIO_NET_F_STANDBY)) { > vi->failover = net_failover_create(vi->dev); > - if (IS_ERR(vi->failover)) > + if (IS_ERR(vi->failover)) { > + err = PTR_ERR(vi->failover); > goto free_vqs; > + } > } > > err = register_netdev(dev);
From: Wei Yongjun <weiyongjun1@huawei.com> Date: Thu, 31 May 2018 02:05:07 +0000 > Fix to return a negative error code from the failover create fail error > handling case instead of 0, as done elsewhere in this function. > > Fixes: ba5e4426e80e ("virtio_net: Extend virtio to use VF datapath when available") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Applied.
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 8f08a3e..2d55e2a 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -2935,8 +2935,10 @@ static int virtnet_probe(struct virtio_device *vdev) if (virtio_has_feature(vdev, VIRTIO_NET_F_STANDBY)) { vi->failover = net_failover_create(vi->dev); - if (IS_ERR(vi->failover)) + if (IS_ERR(vi->failover)) { + err = PTR_ERR(vi->failover); goto free_vqs; + } } err = register_netdev(dev);
Fix to return a negative error code from the failover create fail error handling case instead of 0, as done elsewhere in this function. Fixes: ba5e4426e80e ("virtio_net: Extend virtio to use VF datapath when available") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/net/virtio_net.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)