diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-18 17:06:00 -0400 |
| commit | a215aa7b9ab3759c047201199fba64d3042d7f13 (patch) | |
| tree | bca37493d9b2233450e6d3ffced1261d0e4f71fe /drivers/ssb/pcmcia.c | |
| parent | d31199a77ef606f1d06894385f1852181ba6136b (diff) | |
Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso
Diffstat (limited to 'drivers/ssb/pcmcia.c')
| -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 526682d68de8..17053a5eb258 100644 --- a/drivers/ssb/pcmcia.c +++ b/drivers/ssb/pcmcia.c | |||
| @@ -734,7 +734,7 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus, | |||
| 734 | 734 | ||
| 735 | /* Fetch the vendor specific tuples. */ | 735 | /* Fetch the vendor specific tuples. */ |
| 736 | res = pcmcia_loop_tuple(bus->host_pcmcia, SSB_PCMCIA_CIS, | 736 | res = pcmcia_loop_tuple(bus->host_pcmcia, SSB_PCMCIA_CIS, |
| 737 | ssb_pcmcia_do_get_invariants, sprom); | 737 | ssb_pcmcia_do_get_invariants, iv); |
| 738 | if ((res == 0) || (res == -ENOSPC)) | 738 | if ((res == 0) || (res == -ENOSPC)) |
| 739 | return 0; | 739 | return 0; |
| 740 | 740 | ||