diff options
| author |   Mark Brown <broonie@kernel.org> | 2020-12-28 14:16:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-28 14:16:53 +0000 |
| commit | f81325a05e9317f09a2e4ec57a52e4e49eb42b54 (patch) | |
| tree | a5a91589c9ef8e212f2899f1462cfb5c3f0130ef /sound/firewire/amdtp-stream.h | |
| parent | ASoC: meson: axg-tdm-interface: fix loopback (diff) | |
| parent | Linux 5.11-rc1 (diff) | |
| download | linux-dev-f81325a05e9317f09a2e4ec57a52e4e49eb42b54.tar.xz linux-dev-f81325a05e9317f09a2e4ec57a52e4e49eb42b54.zip | |
Merge tag 'v5.11-rc1' into asoc-5.11
Linux 5.11-rc1
Diffstat (limited to 'sound/firewire/amdtp-stream.h')
| -rw-r--r-- | sound/firewire/amdtp-stream.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/amdtp-stream.h b/sound/firewire/amdtp-stream.h index 2ceb57d1d58e..a3daa1f2c1c4 100644 --- a/sound/firewire/amdtp-stream.h +++ b/sound/firewire/amdtp-stream.h @@ -270,7 +270,7 @@ static inline bool amdtp_stream_wait_callback(struct amdtp_stream *s, unsigned int timeout) { return wait_event_timeout(s->callback_wait, - s->callbacked == true, + s->callbacked, msecs_to_jiffies(timeout)) > 0; } |