openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Anton Vorontsov 2008-12-18 08:23:29 +00:00 committed by David S. Miller
parent 1762a29ae5
commit 67c2fb8ff0
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/ucc_geth.c
View File

@ -2300,8 +2300,6 @@ static void ucc_geth_stop(struct ucc_geth_private *ugeth)
tempval &= ~(MACCFG1_ENABLE_RX | MACCFG1_ENABLE_TX); tempval &= ~(MACCFG1_ENABLE_RX | MACCFG1_ENABLE_TX);
out_be32(&ug_regs->maccfg1, tempval); out_be32(&ug_regs->maccfg1, tempval);
free_irq(ugeth->ug_info->uf_info.irq, ugeth->dev);
ucc_geth_memclean(ugeth); ucc_geth_memclean(ugeth);
} }
@ -3759,17 +3757,6 @@ static int ucc_geth_open(struct net_device *dev)
phy_start(ugeth->phydev); phy_start(ugeth->phydev);
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 get IRQ for net device, aborting.",
dev->name);
ucc_geth_stop(ugeth);
goto out_err;
}
err = ugeth_enable(ugeth, COMM_DIR_RX_AND_TX); err = ugeth_enable(ugeth, COMM_DIR_RX_AND_TX);
if (err) { if (err) {
if (netif_msg_ifup(ugeth)) if (netif_msg_ifup(ugeth))
@ -3778,6 +3765,16 @@ static int ucc_geth_open(struct net_device *dev)
goto out_err; goto out_err;
} }
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 get IRQ for net device, aborting.",
dev->name);
ucc_geth_stop(ugeth);
goto out_err;
}
netif_start_queue(dev); netif_start_queue(dev);
return err; return err;
@ -3799,6 +3796,8 @@ static int ucc_geth_close(struct net_device *dev)
ucc_geth_stop(ugeth); ucc_geth_stop(ugeth);
free_irq(ugeth->ug_info->uf_info.irq, ugeth->dev);
phy_disconnect(ugeth->phydev); phy_disconnect(ugeth->phydev);
ugeth->phydev = NULL; ugeth->phydev = NULL;