diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 00:04:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-21 00:04:44 -0400 |
commit | f8965467f366fd18f01feafb5db10512d7b4422c (patch) | |
tree | 3706a9cd779859271ca61b85c63a1bc3f82d626e /drivers/net/wireless/orinoco/spectrum_cs.c | |
parent | a26272e5200765691e67d6780e52b32498fdb659 (diff) | |
parent | 2ec8c6bb5d8f3a62a79f463525054bae1e3d4487 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
qlcnic: adding co maintainer
ixgbe: add support for active DA cables
ixgbe: dcb, do not tag tc_prio_control frames
ixgbe: fix ixgbe_tx_is_paused logic
ixgbe: always enable vlan strip/insert when DCB is enabled
ixgbe: remove some redundant code in setting FCoE FIP filter
ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
ixgbe: fix header len when unsplit packet overflows to data buffer
ipv6: Never schedule DAD timer on dead address
ipv6: Use POSTDAD state
ipv6: Use state_lock to protect ifa state
ipv6: Replace inet6_ifaddr->dead with state
cxgb4: notify upper drivers if the device is already up when they load
cxgb4: keep interrupts available when the ports are brought down
cxgb4: fix initial addition of MAC address
cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
cnic: Convert cnic_local_flags to atomic ops.
can: Fix SJA1000 command register writes on SMP systems
bridge: fix build for CONFIG_SYSFS disabled
ARCNET: Limit com20020 PCI ID matches for SOHARD cards
...
Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).
Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
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 41b9ce42585..b51a9adc80f 100644 --- a/drivers/net/wireless/orinoco/spectrum_cs.c +++ b/drivers/net/wireless/orinoco/spectrum_cs.c | |||
@@ -337,6 +337,7 @@ spectrum_cs_config(struct pcmcia_device *link) | |||
337 | goto failed; | 337 | goto failed; |
338 | 338 | ||
339 | hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); | 339 | hermes_struct_init(hw, mem, HERMES_16BIT_REGSPACING); |
340 | hw->eeprom_pda = true; | ||
340 | 341 | ||
341 | /* | 342 | /* |
342 | * This actually configures the PCMCIA socket -- setting up | 343 | * This actually configures the PCMCIA socket -- setting up |
@@ -359,7 +360,7 @@ spectrum_cs_config(struct pcmcia_device *link) | |||
359 | 360 | ||
360 | /* Register an interface with the stack */ | 361 | /* Register an interface with the stack */ |
361 | if (orinoco_if_add(priv, link->io.BasePort1, | 362 | if (orinoco_if_add(priv, link->io.BasePort1, |
362 | link->irq) != 0) { | 363 | link->irq, NULL) != 0) { |
363 | printk(KERN_ERR PFX "orinoco_if_add() failed\n"); | 364 | printk(KERN_ERR PFX "orinoco_if_add() failed\n"); |
364 | goto failed; | 365 | goto failed; |
365 | } | 366 | } |
@@ -384,9 +385,9 @@ spectrum_cs_release(struct pcmcia_device *link) | |||
384 | 385 | ||
385 | /* We're committed to taking the device away now, so mark the | 386 | /* We're committed to taking the device away now, so mark the |
386 | * hardware as unavailable */ | 387 | * hardware as unavailable */ |
387 | spin_lock_irqsave(&priv->lock, flags); | 388 | priv->hw.ops->lock_irqsave(&priv->lock, &flags); |
388 | priv->hw_unavailable++; | 389 | priv->hw_unavailable++; |
389 | spin_unlock_irqrestore(&priv->lock, flags); | 390 | priv->hw.ops->unlock_irqrestore(&priv->lock, &flags); |
390 | 391 | ||
391 | pcmcia_disable_device(link); | 392 | pcmcia_disable_device(link); |
392 | if (priv->hw.iobase) | 393 | if (priv->hw.iobase) |