git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'selinux-pr-20210629' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
sound
/
firewire
/
amdtp-stream.c
diff --git
a/sound/firewire/amdtp-stream.c
b/sound/firewire/amdtp-stream.c
index e0faa6601966cae2a53e82e80b4a768d79997192..5805c5de39fbf7fc8c4011aa2e9433e4ab367ae1 100644
(file)
--- a/
sound/firewire/amdtp-stream.c
+++ b/
sound/firewire/amdtp-stream.c
@@
-804,7
+804,7
@@
static void generate_pkt_descs(struct amdtp_stream *s, struct pkt_desc *descs,
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);
}