diff options
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-alsa.c | 4 | ||||
| -rw-r--r-- | v4l/ChangeLog | 9 |
2 files changed, 12 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c index 102e9ab19..f16495e71 100644 --- a/linux/drivers/media/video/saa7134/saa7134-alsa.c +++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c @@ -1,7 +1,7 @@ /* * SAA713x ALSA support for V4L * - * $Id: saa7134-alsa.c,v 1.24 2005/11/09 18:30:51 mchehab Exp $ + * $Id: saa7134-alsa.c,v 1.25 2005/11/09 19:07:31 rmcc Exp $ * * Caveats: * - Volume doesn't work (it's always at max) @@ -977,6 +977,8 @@ int alsa_card_saa7134_create(struct saa7134_dev *dev, int devnum) goto __nodev; } + init_MUTEX(&dev->dmasound.lock); + if ((err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops)) < 0) { goto __nodev; } diff --git a/v4l/ChangeLog b/v4l/ChangeLog index b2783b750..6c7edaf61 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,12 @@ +2005-11-09 19:04 rmcc + + * ../linux/drivers/media/video/saa7134/saa7134-alsa.c: + (alsa_card_saa7134_create): + + - Fix saa7134-alsa spinlock bug + + Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> + 2005-11-09 18:21 mchehab * ../linux/drivers/media/video/Makefile: |