Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6-omap-h63xx.git] / drivers / ssb / pcmcia.c

diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index 96993080c7d17888bf2e1df8ccb93b2a16a85a76..fbfadbac67e887d190ac1c93b87d957cf90146fa 100644 (file)
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -733,7 +733,7 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
                        break;
                }
                res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
-               if (res == CS_NO_MORE_ITEMS)
+               if (res == -ENOSPC)
                        break;
                GOTO_ERROR_ON(res != 0, "VEN next tpl");
                res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);