Skip to content

Commit 3be6a1c

Browse files
bugobliteratorjschall
authored andcommitted
can: only pop tx frame from queue if write was successfull
1 parent 9ec430a commit 3be6a1c

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

modules/can/can.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -471,10 +471,11 @@ static void can_try_enqueue_waiting_frame_I(struct can_instance_s* instance) {
471471

472472
struct can_tx_frame_s* frame = can_tx_queue_peek_I(&instance->tx_queue);
473473
if (frame && (!have_pending_mailbox || can_get_tx_frame_priority_X(frame) > highest_prio_pending)) {
474-
can_tx_queue_pop_I(&instance->tx_queue);
475-
instance->tx_mailbox[empty_mailbox_idx].frame = frame;
476-
instance->tx_mailbox[empty_mailbox_idx].state = CAN_TX_MAILBOX_PENDING;
477-
instance->driver_iface->load_tx_mailbox_I(instance->driver_ctx, empty_mailbox_idx, &frame->content);
474+
if (instance->driver_iface->load_tx_mailbox_I(instance->driver_ctx, empty_mailbox_idx, &frame->content)) {
475+
can_tx_queue_pop_I(&instance->tx_queue);
476+
instance->tx_mailbox[empty_mailbox_idx].frame = frame;
477+
instance->tx_mailbox[empty_mailbox_idx].state = CAN_TX_MAILBOX_PENDING;
478+
}
478479
}
479480
}
480481

0 commit comments

Comments
 (0)