summaryrefslogtreecommitdiff
path: root/sound/firewire
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2020-11-24 11:12:37 +0300
committerTakashi Iwai <tiwai@suse.de>2020-11-24 11:13:00 +0300
commit43906287380f962a7178059cf8da1e03d94da3e0 (patch)
tree669a295bf922e54c9a221550bb4598c3758ba9a0 /sound/firewire
parent9ac05523d38d4c2f40c9e41fc1453146fcd74368 (diff)
parent29b105d947c661e521bf7b1005868c02441732be (diff)
downloadlinux-43906287380f962a7178059cf8da1e03d94da3e0.tar.xz
Merge branch 'topic/usb-audio-refactoring' into for-next
Pull the USB audio improvement Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire')
-rw-r--r--sound/firewire/fireworks/fireworks_transaction.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/firewire/fireworks/fireworks_transaction.c b/sound/firewire/fireworks/fireworks_transaction.c
index 0f533f5bd960..9f8c53b39f95 100644
--- a/sound/firewire/fireworks/fireworks_transaction.c
+++ b/sound/firewire/fireworks/fireworks_transaction.c
@@ -123,7 +123,7 @@ copy_resp_to_buf(struct snd_efw *efw, void *data, size_t length, int *rcode)
t = (struct snd_efw_transaction *)data;
length = min_t(size_t, be32_to_cpu(t->length) * sizeof(u32), length);
- spin_lock_irq(&efw->lock);
+ spin_lock(&efw->lock);
if (efw->push_ptr < efw->pull_ptr)
capacity = (unsigned int)(efw->pull_ptr - efw->push_ptr);
@@ -190,7 +190,7 @@ handle_resp_for_user(struct fw_card *card, int generation, int source,
copy_resp_to_buf(efw, data, length, rcode);
end:
- spin_unlock_irq(&instances_lock);
+ spin_unlock(&instances_lock);
}
static void