]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ssb-pcmcia: Fix parsing of invariants tuples
authorMichael Büsch <mb@bu3sch.de>
Fri, 4 Feb 2011 22:34:45 +0000 (23:34 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 7 Feb 2011 21:02:14 +0000 (16:02 -0500)
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>
drivers/ssb/pcmcia.c

index c7345dbf43fa75228637d914c9d3f153d712c25e..f8533795ee7f6f10a32ec4aac1d236cd700ce052 100644 (file)
@@ -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;