diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-alsa.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-alsa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c index a7a6ab9298a9..d3c7345a5d22 100644 --- a/drivers/media/video/saa7134/saa7134-alsa.c +++ b/drivers/media/video/saa7134/saa7134-alsa.c | |||
@@ -609,12 +609,12 @@ static int snd_card_saa7134_capture_open(snd_pcm_substream_t * substream) | |||
609 | struct saa7134_dev *dev = saa7134->dev; | 609 | struct saa7134_dev *dev = saa7134->dev; |
610 | int err; | 610 | int err; |
611 | 611 | ||
612 | down(&dev->dmasound.lock); | 612 | mutex_lock(&dev->dmasound.lock); |
613 | 613 | ||
614 | dev->dmasound.read_count = 0; | 614 | dev->dmasound.read_count = 0; |
615 | dev->dmasound.read_offset = 0; | 615 | dev->dmasound.read_offset = 0; |
616 | 616 | ||
617 | up(&dev->dmasound.lock); | 617 | mutex_unlock(&dev->dmasound.lock); |
618 | 618 | ||
619 | pcm = kzalloc(sizeof(*pcm), GFP_KERNEL); | 619 | pcm = kzalloc(sizeof(*pcm), GFP_KERNEL); |
620 | if (pcm == NULL) | 620 | if (pcm == NULL) |
@@ -932,7 +932,7 @@ static int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum) | |||
932 | 932 | ||
933 | chip->irq = dev->pci->irq; | 933 | chip->irq = dev->pci->irq; |
934 | 934 | ||
935 | init_MUTEX(&dev->dmasound.lock); | 935 | mutex_init(&dev->dmasound.lock); |
936 | 936 | ||
937 | if ((err = snd_card_saa7134_new_mixer(chip)) < 0) | 937 | if ((err = snd_card_saa7134_new_mixer(chip)) < 0) |
938 | goto __nodev; | 938 | goto __nodev; |