diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-16 17:03:57 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-16 17:03:57 -0500 |
| commit | 96cf45cf559be375de29dd45afc50fa8946fb2aa (patch) | |
| tree | 06242d4256aadc01aee67dfafbb94541e7a17738 /sound/isa/sb/sb8.c | |
| parent | 4c9f1d3ed7e5f910b66dc4d1456cfac17e58cf0e (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge
Diffstat (limited to 'sound/isa/sb/sb8.c')
| -rw-r--r-- | sound/isa/sb/sb8.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c index ea06877be4b1..3cd57ee54660 100644 --- a/sound/isa/sb/sb8.c +++ b/sound/isa/sb/sb8.c | |||
| @@ -103,10 +103,10 @@ static int __devinit snd_sb8_probe(struct device *pdev, unsigned int dev) | |||
| 103 | struct snd_opl3 *opl3; | 103 | struct snd_opl3 *opl3; |
| 104 | int err; | 104 | int err; |
| 105 | 105 | ||
| 106 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, | 106 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, |
| 107 | sizeof(struct snd_sb8)); | 107 | sizeof(struct snd_sb8), &card); |
| 108 | if (card == NULL) | 108 | if (err < 0) |
| 109 | return -ENOMEM; | 109 | return err; |
| 110 | acard = card->private_data; | 110 | acard = card->private_data; |
| 111 | card->private_free = snd_sb8_free; | 111 | card->private_free = snd_sb8_free; |
| 112 | 112 | ||