diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/atmel_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/wavelan_cs.c | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c index 962272c1342a..d09b1472e673 100644 --- a/drivers/net/wireless/atmel_cs.c +++ b/drivers/net/wireless/atmel_cs.c | |||
@@ -220,7 +220,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0) | |||
220 | static int card_present(void *arg) | 220 | static int card_present(void *arg) |
221 | { | 221 | { |
222 | struct pcmcia_device *link = (struct pcmcia_device *)arg; | 222 | struct pcmcia_device *link = (struct pcmcia_device *)arg; |
223 | if (link->state & DEV_SUSPEND) | 223 | if (link->suspended) |
224 | return 0; | 224 | return 0; |
225 | else if (link->state & DEV_PRESENT) | 225 | else if (link->state & DEV_PRESENT) |
226 | return 1; | 226 | return 1; |
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 8cfe9332a3c1..e3924339fabe 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -1968,7 +1968,7 @@ static irqreturn_t ray_interrupt(int irq, void *dev_id, struct pt_regs * regs) | |||
1968 | 1968 | ||
1969 | local = (ray_dev_t *)dev->priv; | 1969 | local = (ray_dev_t *)dev->priv; |
1970 | link = (struct pcmcia_device *)local->finder; | 1970 | link = (struct pcmcia_device *)local->finder; |
1971 | if ( ! (link->state & DEV_PRESENT) || link->state & DEV_SUSPEND ) { | 1971 | if ( ! (link->state & DEV_PRESENT) || link->suspended ) { |
1972 | DEBUG(2,"ray_cs interrupt from device not present or suspended.\n"); | 1972 | DEBUG(2,"ray_cs interrupt from device not present or suspended.\n"); |
1973 | return IRQ_NONE; | 1973 | return IRQ_NONE; |
1974 | } | 1974 | } |
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c index 7373caf6e8e8..6b6769654777 100644 --- a/drivers/net/wireless/wavelan_cs.c +++ b/drivers/net/wireless/wavelan_cs.c | |||
@@ -4744,7 +4744,6 @@ static int wavelan_resume(struct pcmcia_device *link) | |||
4744 | { | 4744 | { |
4745 | struct net_device * dev = (struct net_device *) link->priv; | 4745 | struct net_device * dev = (struct net_device *) link->priv; |
4746 | 4746 | ||
4747 | link->state &= ~DEV_SUSPEND; | ||
4748 | if ((link->state & DEV_CONFIG) && (link->open)) { | 4747 | if ((link->state & DEV_CONFIG) && (link->open)) { |
4749 | wv_hw_reset(dev); | 4748 | wv_hw_reset(dev); |
4750 | netif_device_attach(dev); | 4749 | netif_device_attach(dev); |