diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-02-21 11:16:43 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-02-21 11:17:06 +0100 |
| commit | 3fdecc7d9aca8a824ce3be9d20f6366d132579fc (patch) | |
| tree | 9be9686f26842e6deb0b04f597711cdc7526f58a /sound/firewire/amdtp-stream.c | |
| parent | 5f91a62217730910ceb3e712dd0c28ee71423a27 (diff) | |
| parent | 67c3d7717efbd46092f217b1f811df1b205cce06 (diff) | |
| download | linux-3fdecc7d9aca8a824ce3be9d20f6366d132579fc.tar.gz linux-3fdecc7d9aca8a824ce3be9d20f6366d132579fc.tar.bz2 linux-3fdecc7d9aca8a824ce3be9d20f6366d132579fc.zip | |
Merge branch 'for-linus' into for-next
Pull 6.8-rc devel branch. The trivial merge conflict got resolved.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/amdtp-stream.c')
| -rw-r--r-- | sound/firewire/amdtp-stream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index 9d5a025d2e96..c9f153f85ae6 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -955,7 +955,7 @@ static int generate_tx_packet_descs(struct amdtp_stream *s, struct pkt_desc *des // to the reason. unsigned int safe_cycle = increment_ohci_cycle_count(next_cycle, IR_JUMBO_PAYLOAD_MAX_SKIP_CYCLES); - lost = (compare_ohci_cycle_count(safe_cycle, cycle) > 0); + lost = (compare_ohci_cycle_count(safe_cycle, cycle) < 0); } if (lost) { dev_err(&s->unit->device, "Detect discontinuity of cycle: %d %d\n", |