diff options
| author | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
|---|---|---|
| committer | Jeremy Erickson <jerickso@cs.unc.edu> | 2014-04-11 13:24:45 -0400 |
| commit | 438145c7ef5c9445f25bb8fc4d52e2c9d11fdc7c (patch) | |
| tree | 76941991e36f4a32bf1be0db3854959053f24619 /drivers/ssb/pcmcia.c | |
| parent | 9ddd1b8ad8abd321964b8add5581910de6d67c2a (diff) | |
Update from 2.6.36 to 2.6.36.4wip-dissipation-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 | ||