summaryrefslogtreecommitdiffstats
path: root/drivers/ssb
diff options
context:
space:
mode:
authorMichael Büsch <mb@bu3sch.de>2011-02-04 23:34:45 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-02-07 16:02:14 -0500
commitdd3cb633078fb12e06ce6cebbdfbf55a7562e929 (patch)
tree07b1e80b4979a0ed09ac355569ccf30f8506983c /drivers/ssb
parent9cf04dcc9c5ef884e952b2f461f39f682ef5c051 (diff)
downloadop-kernel-dev-dd3cb633078fb12e06ce6cebbdfbf55a7562e929.zip
op-kernel-dev-dd3cb633078fb12e06ce6cebbdfbf55a7562e929.tar.gz
ssb-pcmcia: Fix parsing of invariants tuples
This fixes parsing of the device invariants (MAC address) for PCMCIA SSB devices. ssb_pcmcia_do_get_invariants expects an iv pointer as data argument. Tested-by: dylan cristiani <d.cristiani@idem-tech.it> Signed-off-by: Michael Buesch <mb@bu3sch.de> Cc: stable@kernel.org Signed-off-by: John W. Linville <linville@tuxdriver.com>
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 c7345db..f853379 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;
OpenPOWER on IntegriCloud