diff options
Diffstat (limited to 'drivers/pcmcia/cistpl.c')
-rw-r--r-- | drivers/pcmcia/cistpl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c index 660e162c502f..a59e09dd8557 100644 --- a/drivers/pcmcia/cistpl.c +++ b/drivers/pcmcia/cistpl.c | |||
@@ -450,7 +450,7 @@ int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple | |||
450 | if (pccard_get_next_tuple(s, function, tuple) == 0) { | 450 | if (pccard_get_next_tuple(s, function, tuple) == 0) { |
451 | tuple->DesiredTuple = CISTPL_LINKTARGET; | 451 | tuple->DesiredTuple = CISTPL_LINKTARGET; |
452 | if (pccard_get_next_tuple(s, function, tuple) != 0) | 452 | if (pccard_get_next_tuple(s, function, tuple) != 0) |
453 | return CS_NO_MORE_ITEMS; | 453 | return -ENOSPC; |
454 | } else | 454 | } else |
455 | tuple->CISOffset = tuple->TupleLink = 0; | 455 | tuple->CISOffset = tuple->TupleLink = 0; |
456 | tuple->DesiredTuple = req; | 456 | tuple->DesiredTuple = req; |
@@ -526,7 +526,7 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_ | |||
526 | /* End of chain? Follow long link if possible */ | 526 | /* End of chain? Follow long link if possible */ |
527 | if (link[0] == CISTPL_END) { | 527 | if (link[0] == CISTPL_END) { |
528 | if ((ofs = follow_link(s, tuple)) < 0) | 528 | if ((ofs = follow_link(s, tuple)) < 0) |
529 | return CS_NO_MORE_ITEMS; | 529 | return -ENOSPC; |
530 | attr = SPACE(tuple->Flags); | 530 | attr = SPACE(tuple->Flags); |
531 | read_cis_cache(s, attr, ofs, 2, link); | 531 | read_cis_cache(s, attr, ofs, 2, link); |
532 | } | 532 | } |
@@ -584,7 +584,7 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_ | |||
584 | } | 584 | } |
585 | if (i == MAX_TUPLES) { | 585 | if (i == MAX_TUPLES) { |
586 | cs_dbg(s, 1, "cs: overrun in pcmcia_get_next_tuple\n"); | 586 | cs_dbg(s, 1, "cs: overrun in pcmcia_get_next_tuple\n"); |
587 | return CS_NO_MORE_ITEMS; | 587 | return -ENOSPC; |
588 | } | 588 | } |
589 | 589 | ||
590 | tuple->TupleCode = link[0]; | 590 | tuple->TupleCode = link[0]; |
@@ -606,7 +606,7 @@ int pccard_get_tuple_data(struct pcmcia_socket *s, tuple_t *tuple) | |||
606 | return -EINVAL; | 606 | return -EINVAL; |
607 | 607 | ||
608 | if (tuple->TupleLink < tuple->TupleOffset) | 608 | if (tuple->TupleLink < tuple->TupleOffset) |
609 | return CS_NO_MORE_ITEMS; | 609 | return -ENOSPC; |
610 | len = tuple->TupleLink - tuple->TupleOffset; | 610 | len = tuple->TupleLink - tuple->TupleOffset; |
611 | tuple->TupleDataLen = tuple->TupleLink; | 611 | tuple->TupleDataLen = tuple->TupleLink; |
612 | if (len == 0) | 612 | if (len == 0) |
@@ -1490,7 +1490,7 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned | |||
1490 | cards have only a broken VERS_2 tuple; hence the bogus test. */ | 1490 | cards have only a broken VERS_2 tuple; hence the bogus test. */ |
1491 | if ((pccard_read_tuple(s, function, CISTPL_MANFID, p) == 0) || | 1491 | if ((pccard_read_tuple(s, function, CISTPL_MANFID, p) == 0) || |
1492 | (pccard_read_tuple(s, function, CISTPL_VERS_1, p) == 0) || | 1492 | (pccard_read_tuple(s, function, CISTPL_VERS_1, p) == 0) || |
1493 | (pccard_read_tuple(s, function, CISTPL_VERS_2, p) != CS_NO_MORE_ITEMS)) | 1493 | (pccard_read_tuple(s, function, CISTPL_VERS_2, p) != -ENOSPC)) |
1494 | ident_ok++; | 1494 | ident_ok++; |
1495 | 1495 | ||
1496 | if (!dev_ok && !ident_ok) | 1496 | if (!dev_ok && !ident_ok) |