summaryrefslogtreecommitdiff
path: root/drivers/ssb
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-02-08 12:03:54 -0800
committerDavid S. Miller <davem@davemloft.net>2011-02-08 12:03:54 -0800
commite0985f27ddc3cd49c56fc3a76ec4ae3a594315d0 (patch)
treea0261a4fae2b2e288cbc7e14a8f1acd47d4f2df4 /drivers/ssb
parent429a01a70f301baf0c8fc780f891a18c296d5e24 (diff)
parentfc7c976dc7a565213393ce700d4a6105f037bf20 (diff)
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index c7345dbf43f..f8533795ee7 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;