diff options
author | Kristian Høgsberg <krh@redhat.com> | 2007-01-26 00:38:34 -0500 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2007-03-09 16:02:47 -0500 |
commit | e5f49c3b837ff90c8aec2c6c66c4966080aced06 (patch) | |
tree | 16f6cb30602b9e63b9dc3a0a4ef8b56dcaf10346 /drivers/firewire/fw-ohci.c | |
parent | 93c4cceb963ebb133531e5e3f4f6e2da0d222656 (diff) |
firewire: Sanitize send error codes.
Drop the negative errnos and use RCODEs for all error codes
in the complete transaction callback.
Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire/fw-ohci.c')
-rw-r--r-- | drivers/firewire/fw-ohci.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index ac6c018de0dc..58bc85dd7917 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c | |||
@@ -376,7 +376,7 @@ at_context_setup_packet(struct at_context *ctx, struct list_head *list) | |||
376 | packet->payload_length, | 376 | packet->payload_length, |
377 | DMA_TO_DEVICE); | 377 | DMA_TO_DEVICE); |
378 | if (packet->payload_bus == 0) { | 378 | if (packet->payload_bus == 0) { |
379 | complete_transmission(packet, -ENOMEM, list); | 379 | complete_transmission(packet, RCODE_SEND_ERROR, list); |
380 | return; | 380 | return; |
381 | } | 381 | } |
382 | 382 | ||
@@ -438,7 +438,7 @@ at_context_setup_packet(struct at_context *ctx, struct list_head *list) | |||
438 | /* We dont return error codes from this function; all | 438 | /* We dont return error codes from this function; all |
439 | * transmission errors are reported through the | 439 | * transmission errors are reported through the |
440 | * callback. */ | 440 | * callback. */ |
441 | complete_transmission(packet, -ESTALE, list); | 441 | complete_transmission(packet, RCODE_GENERATION, list); |
442 | } | 442 | } |
443 | } | 443 | } |
444 | 444 | ||
@@ -484,26 +484,26 @@ static void at_context_tasklet(unsigned long data) | |||
484 | switch (evt) { | 484 | switch (evt) { |
485 | case OHCI1394_evt_timeout: | 485 | case OHCI1394_evt_timeout: |
486 | /* Async response transmit timed out. */ | 486 | /* Async response transmit timed out. */ |
487 | complete_transmission(packet, -ETIMEDOUT, &list); | 487 | complete_transmission(packet, RCODE_CANCELLED, &list); |
488 | break; | 488 | break; |
489 | 489 | ||
490 | case OHCI1394_evt_flushed: | 490 | case OHCI1394_evt_flushed: |
491 | /* The packet was flushed should give same | 491 | /* The packet was flushed should give same |
492 | * error as when we try to use a stale | 492 | * error as when we try to use a stale |
493 | * generation count. */ | 493 | * generation count. */ |
494 | complete_transmission(packet, -ESTALE, &list); | 494 | complete_transmission(packet, |
495 | RCODE_GENERATION, &list); | ||
495 | break; | 496 | break; |
496 | 497 | ||
497 | case OHCI1394_evt_missing_ack: | 498 | case OHCI1394_evt_missing_ack: |
498 | /* This would be a higher level software | 499 | /* Using a valid (current) generation count, |
499 | * error, it is using a valid (current) | 500 | * but the node is not on the bus or not |
500 | * generation count, but the node is not on | 501 | * sending acks. */ |
501 | * the bus. */ | 502 | complete_transmission(packet, RCODE_NO_ACK, &list); |
502 | complete_transmission(packet, -ENODEV, &list); | ||
503 | break; | 503 | break; |
504 | 504 | ||
505 | default: | 505 | default: |
506 | complete_transmission(packet, -EIO, &list); | 506 | complete_transmission(packet, RCODE_SEND_ERROR, &list); |
507 | break; | 507 | break; |
508 | } | 508 | } |
509 | } else | 509 | } else |