diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-08 15:03:54 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-08 15:03:54 -0500 |
| commit | e0985f27ddc3cd49c56fc3a76ec4ae3a594315d0 (patch) | |
| tree | a0261a4fae2b2e288cbc7e14a8f1acd47d4f2df4 /drivers/ssb | |
| parent | 429a01a70f301baf0c8fc780f891a18c296d5e24 (diff) | |
| parent | fc7c976dc7a565213393ce700d4a6105f037bf20 (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.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, | |||
| 733 | 733 | ||
| 734 | /* Fetch the vendor specific tuples. */ | 734 | /* Fetch the vendor specific tuples. */ |
| 735 | res = pcmcia_loop_tuple(bus->host_pcmcia, SSB_PCMCIA_CIS, | 735 | res = pcmcia_loop_tuple(bus->host_pcmcia, SSB_PCMCIA_CIS, |
| 736 | ssb_pcmcia_do_get_invariants, sprom); | 736 | ssb_pcmcia_do_get_invariants, iv); |
| 737 | if ((res == 0) || (res == -ENOSPC)) | 737 | if ((res == 0) || (res == -ENOSPC)) |
| 738 | return 0; | 738 | return 0; |
| 739 | 739 | ||