projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'cross-rename' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs
[linux-2.6-block.git]
/
sound
/
sh
/
aica.c
diff --git
a/sound/sh/aica.c
b/sound/sh/aica.c
index 78a369785a9ecf3b3e8d1a72e6b536e6a8ddb89a..47849eaf266d5c1e2ba17ddd50edf4dda6381d92 100644
(file)
--- a/
sound/sh/aica.c
+++ b/
sound/sh/aica.c
@@
-608,8
+608,8
@@
static int snd_aica_probe(struct platform_device *devptr)
dreamcastcard = kmalloc(sizeof(struct snd_card_aica), GFP_KERNEL);
if (unlikely(!dreamcastcard))
return -ENOMEM;
dreamcastcard = kmalloc(sizeof(struct snd_card_aica), GFP_KERNEL);
if (unlikely(!dreamcastcard))
return -ENOMEM;
- err = snd_card_
create(index, SND_AICA_DRIVER, THIS_MODULE, 0
,
-
&dreamcastcard->card);
+ err = snd_card_
new(&devptr->dev, index, SND_AICA_DRIVER
,
+
THIS_MODULE, 0,
&dreamcastcard->card);
if (unlikely(err < 0)) {
kfree(dreamcastcard);
return err;
if (unlikely(err < 0)) {
kfree(dreamcastcard);
return err;
@@
-624,7
+624,6
@@
static int snd_aica_probe(struct platform_device *devptr)
err = snd_aicapcmchip(dreamcastcard, 0);
if (unlikely(err < 0))
goto freedreamcast;
err = snd_aicapcmchip(dreamcastcard, 0);
if (unlikely(err < 0))
goto freedreamcast;
- snd_card_set_dev(dreamcastcard->card, &devptr->dev);
dreamcastcard->timer.data = 0;
dreamcastcard->channel = NULL;
/* Add basic controls */
dreamcastcard->timer.data = 0;
dreamcastcard->channel = NULL;
/* Add basic controls */