summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-01-12 15:18:28 +0100
committerTakashi Iwai <tiwai@suse.de>2009-01-12 15:25:11 +0100
commit6ff1871617a3ea1eeaf88b42f652f9a311826bad (patch)
tree5d2cec2f74da364b9648afad7bf35eb4be7a7994 /drivers
parent758021bfa9ea25c58e62d2f68512628b19502ce7 (diff)
downloadblackbird-op-linux-6ff1871617a3ea1eeaf88b42f652f9a311826bad.tar.gz
blackbird-op-linux-6ff1871617a3ea1eeaf88b42f652f9a311826bad.zip
drivers/staging: Convert to snd_card_create() for go7007
Convert from snd_card_new to the new snd_card_create() for go7007. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/staging/go7007/snd-go7007.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/go7007/snd-go7007.c b/drivers/staging/go7007/snd-go7007.c
index a7de401f61ab..cd19be6c00e0 100644
--- a/drivers/staging/go7007/snd-go7007.c
+++ b/drivers/staging/go7007/snd-go7007.c
@@ -248,10 +248,11 @@ int go7007_snd_init(struct go7007 *go)
spin_lock_init(&gosnd->lock);
gosnd->hw_ptr = gosnd->w_idx = gosnd->avail = 0;
gosnd->capturing = 0;
- gosnd->card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
- if (gosnd->card == NULL) {
+ ret = snd_card_create(index[dev], id[dev], THIS_MODULE, 0,
+ &gosnd->card);
+ if (ret < 0) {
kfree(gosnd);
- return -ENOMEM;
+ return ret;
}
ret = snd_device_new(gosnd->card, SNDRV_DEV_LOWLEVEL, go,
&go7007_snd_device_ops);
OpenPOWER on IntegriCloud