summaryrefslogtreecommitdiff
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2021-06-08 15:02:06 +0300
committerTakashi Iwai <tiwai@suse.de>2021-06-08 15:02:06 +0300
commit0280e07bbd6efa691daa7356b6bb05514cdcab68 (patch)
tree1ef76c078b566050dbc865ee9afeb0d526329893 /sound/firewire
parent5fe8f0a0a83ab78c75010e161fa27ae66e36cd64 (diff)
parent600dd2a7e8b62170d177381cc1303861f48f9780 (diff)
downloadlinux-0280e07bbd6efa691daa7356b6bb05514cdcab68.tar.xz
Merge branch 'for-linus' into for-next
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/amdtp-stream.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c
index 4d78900b9cca..150ee0b9e707 100644
--- a/sound/firewire/amdtp-stream.c
+++ b/sound/firewire/amdtp-stream.c
@@ -1032,7 +1032,7 @@ static void generate_pkt_descs(struct amdtp_stream *s, const __be32 *ctx_header,
static inline void cancel_stream(struct amdtp_stream *s)
{
s->packet_index = -1;
- if (current_work() == &s->period_work)
+ if (in_interrupt())
amdtp_stream_pcm_abort(s);
WRITE_ONCE(s->pcm_buffer_pointer, SNDRV_PCM_POS_XRUN);
}