diff options
Diffstat (limited to 'drivers/net/wireless/orinoco/spectrum_cs.c')
-rw-r--r-- | drivers/net/wireless/orinoco/spectrum_cs.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c index 59bda240fdc..9b1af4976bf 100644 --- a/drivers/net/wireless/orinoco/spectrum_cs.c +++ b/drivers/net/wireless/orinoco/spectrum_cs.c | |||
@@ -349,6 +349,7 @@ spectrum_cs_config(struct pcmcia_device *link) | |||
349 | goto failed; | 349 | goto failed; |
350 | 350 | ||
351 | hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); | 351 | hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); |
352 | hw->eeprom_pda = true; | ||
352 | 353 | ||
353 | /* | 354 | /* |
354 | * This actually configures the PCMCIA socket -- setting up | 355 | * This actually configures the PCMCIA socket -- setting up |
@@ -374,7 +375,7 @@ spectrum_cs_config(struct pcmcia_device *link) | |||
374 | 375 | ||
375 | /* Register an interface with the stack */ | 376 | /* Register an interface with the stack */ |
376 | if (orinoco_if_add(priv, link->io.BasePort1, | 377 | if (orinoco_if_add(priv, link->io.BasePort1, |
377 | link->irq.AssignedIRQ) != 0) { | 378 | link->irq.AssignedIRQ, NULL) != 0) { |
378 | printk(KERN_ERR PFX "orinoco_if_add() failed\n"); | 379 | printk(KERN_ERR PFX "orinoco_if_add() failed\n"); |
379 | goto failed; | 380 | goto failed; |
380 | } | 381 | } |
@@ -405,9 +406,9 @@ spectrum_cs_release(struct pcmcia_device *link) | |||
405 | 406 | ||
406 | /* We're committed to taking the device away now, so mark the | 407 | /* We're committed to taking the device away now, so mark the |
407 | * hardware as unavailable */ | 408 | * hardware as unavailable */ |
408 | spin_lock_irqsave(&priv->lock, flags); | 409 | priv->hw.ops->lock_irqsave(&priv->lock, &flags); |
409 | priv->hw_unavailable++; | 410 | priv->hw_unavailable++; |
410 | spin_unlock_irqrestore(&priv->lock, flags); | 411 | priv->hw.ops->unlock_irqrestore(&priv->lock, &flags); |
411 | 412 | ||
412 | pcmcia_disable_device(link); | 413 | pcmcia_disable_device(link); |
413 | if (priv->hw.iobase) | 414 | if (priv->hw.iobase) |