Commit 67c2fb8f authored by Anton Vorontsov's avatar Anton Vorontsov Committed by David S. Miller
Browse files

ucc_geth: Fix IRQ freeing code in ucc_geth_open() 



open() routine calls stop() in case of errors, the function will try
to free the requested IRQ. But we don't know if it was actually
requested, so the code might issue bogus free_irq(0, dev) call.

Fix this by rearranging the code so that now request_irq() is the last
call in the open() routine, and move free_irq() into the close().

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1762a29a

drivers/net/ucc_geth.c

+8 −9
Original line number Diff line number Diff line
@@ -2300,8 +2300,6 @@ static void ucc_geth_stop(struct ucc_geth_private *ugeth) 
	tempval &= ~(MACCFG1_ENABLE_RX | MACCFG1_ENABLE_TX);

	out_be32(&ug_regs->maccfg1, tempval);



	free_irq(ugeth->ug_info->uf_info.irq, ugeth->dev);



	ucc_geth_memclean(ugeth);

}
@@ -3759,21 +3757,20 @@ static int ucc_geth_open(struct net_device *dev) 


	phy_start(ugeth->phydev);



	err =

	    request_irq(ugeth->ug_info->uf_info.irq, ucc_geth_irq_handler, 0,

			"UCC Geth", dev);

	err = ugeth_enable(ugeth, COMM_DIR_RX_AND_TX);

	if (err) {

		if (netif_msg_ifup(ugeth))

			ugeth_err("%s: Cannot get IRQ for net device, aborting.",

				  dev->name);

			ugeth_err("%s: Cannot enable net device, aborting.", dev->name);

		ucc_geth_stop(ugeth);

		goto out_err;

	}



	err = ugeth_enable(ugeth, COMM_DIR_RX_AND_TX);

	err = request_irq(ugeth->ug_info->uf_info.irq, ucc_geth_irq_handler,

			  0, "UCC Geth", dev);

	if (err) {

		if (netif_msg_ifup(ugeth))

			ugeth_err("%s: Cannot enable net device, aborting.", dev->name);

			ugeth_err("%s: Cannot get IRQ for net device, aborting.",

				  dev->name);

		ucc_geth_stop(ugeth);

		goto out_err;

	}
@@ -3799,6 +3796,8 @@ static int ucc_geth_close(struct net_device *dev) 


	ucc_geth_stop(ugeth);



	free_irq(ugeth->ug_info->uf_info.irq, ugeth->dev);



	phy_disconnect(ugeth->phydev);

	ugeth->phydev = NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE