Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdf99b3f authored by Christophe Jaillet's avatar Christophe Jaillet Committed by David S. Miller
Browse files

cisco: enic: Fic an error handling path in 'vnic_dev_init_devcmd2()' 



if 'ioread32()' returns 0xFFFFFFF, we have to go through the error
handling path as done everywhere else in this function.

Move the 'err_free_wq' label to better match its name and its location
and add a new label 'err_disable_wq'.
Update the code accordingly.

Fixes: 373fb087 ("enic: add devcmd2")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4c17e1fe

drivers/net/ethernet/cisco/enic/vnic_dev.c

+5 −4
Original line number Diff line number Diff line
@@ -402,8 +402,8 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev) 
	fetch_index = ioread32(&vdev->devcmd2->wq.ctrl->fetch_index);

	if (fetch_index == 0xFFFFFFFF) { /* check for hardware gone  */

		vdev_err(vdev, "Fatal error in devcmd2 init - hardware surprise removal\n");



		return -ENODEV;

		err = -ENODEV;

		goto err_free_wq;

	}



	enic_wq_init_start(&vdev->devcmd2->wq, 0, fetch_index, fetch_index, 0,
@@ -414,7 +414,7 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev) 
	err = vnic_dev_alloc_desc_ring(vdev, &vdev->devcmd2->results_ring,

				       DEVCMD2_RING_SIZE, DEVCMD2_DESC_SIZE);

	if (err)

		goto err_free_wq;

		goto err_disable_wq;



	vdev->devcmd2->result = vdev->devcmd2->results_ring.descs;

	vdev->devcmd2->cmd_ring = vdev->devcmd2->wq.ring.descs;
@@ -433,8 +433,9 @@ static int vnic_dev_init_devcmd2(struct vnic_dev *vdev) 


err_free_desc_ring:

	vnic_dev_free_desc_ring(vdev, &vdev->devcmd2->results_ring);

err_free_wq:

err_disable_wq:

	vnic_wq_disable(&vdev->devcmd2->wq);

err_free_wq:

	vnic_wq_free(&vdev->devcmd2->wq);

err_free_devcmd2:

	kfree(vdev->devcmd2);