Skip to content

Commit 02a9c6e

Browse files
Dan Carpentertiwai
authored andcommitted
ALSA: firewire: Clean up a locking issue in copy_resp_to_buf()
The spin_lock/unlock_irq() functions cannot be nested. The problem is that presumably we would want the IRQs to be re-enabled on the second call the spin_unlock_irq() but instead it will be enabled at the first call so IRQs will be enabled earlier than expected. In this situation the copy_resp_to_buf() function is only called from one function and it is called with IRQs disabled. We can just use the regular spin_lock/unlock() functions. Fixes: 555e8a8 ("ALSA: fireworks: Add command/response functionality into hwdep interface") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20201113101241.GB168908@mwanda Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent 95a793c commit 02a9c6e

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

sound/firewire/fireworks/fireworks_transaction.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ copy_resp_to_buf(struct snd_efw *efw, void *data, size_t length, int *rcode)
123123
t = (struct snd_efw_transaction *)data;
124124
length = min_t(size_t, be32_to_cpu(t->length) * sizeof(u32), length);
125125

126-
spin_lock_irq(&efw->lock);
126+
spin_lock(&efw->lock);
127127

128128
if (efw->push_ptr < efw->pull_ptr)
129129
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,
190190

191191
copy_resp_to_buf(efw, data, length, rcode);
192192
end:
193-
spin_unlock_irq(&instances_lock);
193+
spin_unlock(&instances_lock);
194194
}
195195

196196
static void

0 commit comments

Comments
 (0)