patch-1.3.39 linux/drivers/net/de4x5.c
Next file: linux/drivers/net/de600.c
Previous file: linux/drivers/net/bsd_comp.c
Back to the patch index
Back to the overall index
- Lines: 28
- Date:
Thu Nov 9 08:24:05 1995
- Orig file:
v1.3.38/linux/drivers/net/de4x5.c
- Orig date:
Wed Nov 8 07:11:32 1995
diff -u --recursive --new-file v1.3.38/linux/drivers/net/de4x5.c linux/drivers/net/de4x5.c
@@ -2764,20 +2764,16 @@
{
struct de4x5_private *lp = (struct de4x5_private *) thisDE4X5.priv;
- if (MOD_IN_USE) {
- printk("%s: device busy, remove delayed\n",thisDE4X5.name);
- } else {
- if (lp) {
- kfree_s(bus_to_virt(lp->rx_ring[0].buf), RX_BUFF_SZ * NUM_RX_DESC + ALIGN);
- }
- kfree_s(thisDE4X5.priv, sizeof(struct de4x5_private) + ALIGN);
- thisDE4X5.priv = NULL;
+ if (lp) {
+ kfree_s(bus_to_virt(lp->rx_ring[0].buf), RX_BUFF_SZ * NUM_RX_DESC + ALIGN);
+ }
+ kfree_s(thisDE4X5.priv, sizeof(struct de4x5_private) + ALIGN);
+ thisDE4X5.priv = NULL;
- release_region(thisDE4X5.base_addr, (lp->bus == PCI ?
+ release_region(thisDE4X5.base_addr, (lp->bus == PCI ?
DE4X5_PCI_TOTAL_SIZE :
DE4X5_EISA_TOTAL_SIZE));
- unregister_netdev(&thisDE4X5);
- }
+ unregister_netdev(&thisDE4X5);
}
#endif /* MODULE */
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov
with Sam's (original) version of this