diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 09:46:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-13 09:46:22 -0700 |
| commit | 63f3d1df1ad276a30b75339dd682a6e1f9d0c181 (patch) | |
| tree | 91240ae476d553bda4a92b52ff46823421798f6c /sound/drivers/dummy.c | |
| parent | a8cd2e5045688157479a654786b2c08ab85f4d8f (diff) | |
| parent | 676e1a2c1e7499eee8e7a81e577b4b6ba71ffb25 (diff) | |
| download | linux-63f3d1df1ad276a30b75339dd682a6e1f9d0c181.tar.gz linux-63f3d1df1ad276a30b75339dd682a6e1f9d0c181.tar.bz2 linux-63f3d1df1ad276a30b75339dd682a6e1f9d0c181.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa-current
Diffstat (limited to 'sound/drivers/dummy.c')
| -rw-r--r-- | sound/drivers/dummy.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/drivers/dummy.c b/sound/drivers/dummy.c index a61640cf7ae7..64ef7f62851d 100644 --- a/sound/drivers/dummy.c +++ b/sound/drivers/dummy.c @@ -337,7 +337,7 @@ static int snd_card_dummy_playback_open(snd_pcm_substream_t * substream) snd_card_dummy_pcm_t *dpcm; int err; - dpcm = kcalloc(1, sizeof(*dpcm), GFP_KERNEL); + dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL); if (dpcm == NULL) return -ENOMEM; init_timer(&dpcm->timer); @@ -368,7 +368,7 @@ static int snd_card_dummy_capture_open(snd_pcm_substream_t * substream) snd_card_dummy_pcm_t *dpcm; int err; - dpcm = kcalloc(1, sizeof(*dpcm), GFP_KERNEL); + dpcm = kzalloc(sizeof(*dpcm), GFP_KERNEL); if (dpcm == NULL) return -ENOMEM; init_timer(&dpcm->timer); @@ -600,6 +600,10 @@ static int __init snd_card_dummy_probe(int dev) strcpy(card->driver, "Dummy"); strcpy(card->shortname, "Dummy"); sprintf(card->longname, "Dummy %i", dev + 1); + + if ((err = snd_card_set_generic_dev(card)) < 0) + goto __nodev; + if ((err = snd_card_register(card)) == 0) { snd_dummy_cards[dev] = card; return 0; |