Commit 92ea42f4 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

V4L/DVB (7164): em28xx-alsa: Add a missing mutex

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 00b8730f
...@@ -269,8 +269,11 @@ static int snd_em28xx_capture_open(struct snd_pcm_substream *substream) ...@@ -269,8 +269,11 @@ static int snd_em28xx_capture_open(struct snd_pcm_substream *substream)
dprintk("opening device and trying to acquire exclusive lock\n"); dprintk("opening device and trying to acquire exclusive lock\n");
/* Sets volume, mute, etc */ /* Sets volume, mute, etc */
dev->mute = 0; dev->mute = 0;
mutex_lock(&dev->lock);
ret = em28xx_audio_analog_set(dev); ret = em28xx_audio_analog_set(dev);
mutex_unlock(&dev->lock);
if (ret < 0) if (ret < 0)
goto err; goto err;
...@@ -302,7 +305,9 @@ static int snd_em28xx_pcm_close(struct snd_pcm_substream *substream) ...@@ -302,7 +305,9 @@ static int snd_em28xx_pcm_close(struct snd_pcm_substream *substream)
dprintk("closing device\n"); dprintk("closing device\n");
dev->mute = 1; dev->mute = 1;
mutex_lock(&dev->lock);
em28xx_audio_analog_set(dev); em28xx_audio_analog_set(dev);
mutex_unlock(&dev->lock);
if (dev->adev->users == 0 && dev->adev->shutdown == 1) { if (dev->adev->users == 0 && dev->adev->shutdown == 1) {
dprintk("audio users: %d\n", dev->adev->users); dprintk("audio users: %d\n", dev->adev->users);
......
...@@ -345,7 +345,6 @@ int em28xx_read_reg(struct em28xx *dev, u16 reg); ...@@ -345,7 +345,6 @@ int em28xx_read_reg(struct em28xx *dev, u16 reg);
int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf, int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
int len); int len);
int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len); int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len);
int em28xx_set_audio_source(struct em28xx *dev);
int em28xx_audio_analog_set(struct em28xx *dev); int em28xx_audio_analog_set(struct em28xx *dev);
int em28xx_colorlevels_set_default(struct em28xx *dev); int em28xx_colorlevels_set_default(struct em28xx *dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment