projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
sound
/
pci
/
sis7019.c
diff --git
a/sound/pci/sis7019.c
b/sound/pci/sis7019.c
index e413b4e2c81952101294d993dba70aee9c1a14fb..6b26b93e001d89fa4c80fe3e6e52e1392b1f2c27 100644
(file)
--- a/
sound/pci/sis7019.c
+++ b/
sound/pci/sis7019.c
@@
-1404,8
+1404,6
@@
static int sis_chip_create(struct snd_card *card,
if (rc)
goto error_out_cleanup;
if (rc)
goto error_out_cleanup;
- snd_card_set_dev(card, &pci->dev);
-
return 0;
error_out_cleanup:
return 0;
error_out_cleanup:
@@
-1440,7
+1438,8
@@
static int snd_sis7019_probe(struct pci_dev *pci,
if (!codecs)
codecs = SIS_PRIMARY_CODEC_PRESENT;
if (!codecs)
codecs = SIS_PRIMARY_CODEC_PRESENT;
- rc = snd_card_create(index, id, THIS_MODULE, sizeof(*sis), &card);
+ rc = snd_card_new(&pci->dev, index, id, THIS_MODULE,
+ sizeof(*sis), &card);
if (rc < 0)
goto error_out;
if (rc < 0)
goto error_out;