diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-08 21:03:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-08 21:03:54 +0100 |
| commit | e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0 (patch) | |
| tree | a0261a4fae2b2e288cbc7e14a8f1acd47d4f2df4 /drivers/ssb | |
| parent | Merge branch 'batman-adv/merge' of git://git.open-mesh.org/ecsv/linux-merge (diff) | |
| parent | mac80211: fix the skb cloned check in the tx path (diff) | |
| download | linux-e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0.tar.xz linux-e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/ssb')
| -rw-r--r-- | drivers/ssb/pcmcia.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c index c7345dbf43fa..f8533795ee7f 100644 --- a/drivers/ssb/pcmcia.c +++ b/drivers/ssb/pcmcia.c @@ -733,7 +733,7 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus, /* Fetch the vendor specific tuples. */ res = pcmcia_loop_tuple(bus->host_pcmcia, SSB_PCMCIA_CIS, - ssb_pcmcia_do_get_invariants, sprom); + ssb_pcmcia_do_get_invariants, iv); if ((res == 0) || (res == -ENOSPC)) return 0; |