diff options
| author | Mauro Carvalho Chehab | 2009-09-14 21:37:13 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2010-05-18 05:40:24 +0200 |
| commit | 427f7facb374b8651ff01b7700e690ef8ccae159 (patch) | |
| tree | a4b33e37d583c49da5e34a67cc5f9df755022a6f /drivers/staging/tm6000/tm6000-alsa.c | |
| parent | V4L/DVB (12848): tm6000: Add README with todo list (diff) | |
| download | kernel-qcow2-linux-427f7facb374b8651ff01b7700e690ef8ccae159.tar.gz kernel-qcow2-linux-427f7facb374b8651ff01b7700e690ef8ccae159.tar.xz kernel-qcow2-linux-427f7facb374b8651ff01b7700e690ef8ccae159.zip | |
V4L/DVB (12852): tm6000: Fix compilation against 2.6.31
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging/tm6000/tm6000-alsa.c')
| -rw-r--r-- | drivers/staging/tm6000/tm6000-alsa.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/tm6000/tm6000-alsa.c b/drivers/staging/tm6000/tm6000-alsa.c index 052e2cc255f5..cf24340e0874 100644 --- a/drivers/staging/tm6000/tm6000-alsa.c +++ b/drivers/staging/tm6000/tm6000-alsa.c @@ -17,7 +17,6 @@ #include <linux/usb.h> #include <asm/delay.h> -#include <sound/driver.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> @@ -350,10 +349,10 @@ int tm6000_audio_init(struct tm6000_core *dev, int idx) if (!enable[idx]) return -ENOENT; - card = snd_card_new(index[idx], id[idx], THIS_MODULE, 0); - if (card == NULL) { + rc = snd_card_create(index[idx], id[idx], THIS_MODULE, 0, &card); + if (rc < 0) { snd_printk(KERN_ERR "cannot create card instance %d\n", idx); - return -ENOMEM; + return rc; } chip = kzalloc(sizeof(*chip), GFP_KERNEL); |