diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-31 14:16:31 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-31 14:16:31 +0400 |
| commit | 9ddd84f872898373c51469f9c931d5aa89fdc807 (patch) | |
| tree | d81f9e396801f04d55924c0d3bbd903fe60ebcda /sound/isa/ad1848/ad1848.c | |
| parent | 749d32237bf39e6576dd95bfdf24e4378e51716c (diff) | |
| parent | a4b7f21d7b42b33609df3f86992a8deff80abfaf (diff) | |
| download | linux-9ddd84f872898373c51469f9c931d5aa89fdc807.tar.xz | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/isa/ad1848/ad1848.c')
| -rw-r--r-- | sound/isa/ad1848/ad1848.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/isa/ad1848/ad1848.c b/sound/isa/ad1848/ad1848.c index e3f455bd85cd..093f22a464d7 100644 --- a/sound/isa/ad1848/ad1848.c +++ b/sound/isa/ad1848/ad1848.c @@ -91,7 +91,7 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n) struct snd_pcm *pcm; int error; - error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card); + error = snd_card_new(dev, index[n], id[n], THIS_MODULE, 0, &card); if (error < 0) return error; @@ -119,8 +119,6 @@ static int snd_ad1848_probe(struct device *dev, unsigned int n) if (thinkpad[n]) strcat(card->longname, " [Thinkpad]"); - snd_card_set_dev(card, dev); - error = snd_card_register(card); if (error < 0) goto out; |