git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
net
/
pcmcia
/
fmvj18x_cs.c
diff --git
a/drivers/net/pcmcia/fmvj18x_cs.c
b/drivers/net/pcmcia/fmvj18x_cs.c
index
580af37
..
9c40e61
100644
(file)
--- a/
drivers/net/pcmcia/fmvj18x_cs.c
+++ b/
drivers/net/pcmcia/fmvj18x_cs.c
@@
-332,6
+332,9
@@
static void fmvj18x_detach(dev_link_t *link)
if (*linkp == NULL)
return;
if (*linkp == NULL)
return;
+ if (link->dev)
+ unregister_netdev(dev);
+
if (link->state & DEV_CONFIG)
fmvj18x_release(link);
if (link->state & DEV_CONFIG)
fmvj18x_release(link);
@@
-341,8
+344,6
@@
static void fmvj18x_detach(dev_link_t *link)
/* Unlink device structure, free pieces */
*linkp = link->next;
/* Unlink device structure, free pieces */
*linkp = link->next;
- if (link->dev)
- unregister_netdev(dev);
free_netdev(dev);
} /* fmvj18x_detach */
free_netdev(dev);
} /* fmvj18x_detach */
@@
-741,10
+742,8
@@
static int fmvj18x_event(event_t event, int priority,
switch (event) {
case CS_EVENT_CARD_REMOVAL:
link->state &= ~DEV_PRESENT;
switch (event) {
case CS_EVENT_CARD_REMOVAL:
link->state &= ~DEV_PRESENT;
- if (link->state & DEV_CONFIG)
{
+ if (link->state & DEV_CONFIG)
netif_device_detach(dev);
netif_device_detach(dev);
- fmvj18x_release(link);
- }
break;
case CS_EVENT_CARD_INSERTION:
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
break;
case CS_EVENT_CARD_INSERTION:
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;