diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-05 09:08:33 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-05 09:08:33 -0500 |
commit | 6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7 (patch) | |
tree | 2d6a9fdb99ddd1fb61fac029a4e04ac96e12c179 /sound/isa/sscape.c | |
parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) |
Merge branch 'topic/snd_card_new-err' into topic/atmel
Diffstat (limited to 'sound/isa/sscape.c')
-rw-r--r-- | sound/isa/sscape.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/isa/sscape.c b/sound/isa/sscape.c index 48a16d865834..4025fb558c50 100644 --- a/sound/isa/sscape.c +++ b/sound/isa/sscape.c | |||
@@ -1357,10 +1357,10 @@ static int __devinit snd_sscape_probe(struct device *pdev, unsigned int dev) | |||
1357 | struct soundscape *sscape; | 1357 | struct soundscape *sscape; |
1358 | int ret; | 1358 | int ret; |
1359 | 1359 | ||
1360 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, | 1360 | ret = snd_card_create(index[dev], id[dev], THIS_MODULE, |
1361 | sizeof(struct soundscape)); | 1361 | sizeof(struct soundscape), &card); |
1362 | if (!card) | 1362 | if (ret < 0) |
1363 | return -ENOMEM; | 1363 | return ret; |
1364 | 1364 | ||
1365 | sscape = get_card_soundscape(card); | 1365 | sscape = get_card_soundscape(card); |
1366 | sscape->type = SSCAPE; | 1366 | sscape->type = SSCAPE; |
@@ -1462,10 +1462,10 @@ static int __devinit sscape_pnp_detect(struct pnp_card_link *pcard, | |||
1462 | * Create a new ALSA sound card entry, in anticipation | 1462 | * Create a new ALSA sound card entry, in anticipation |
1463 | * of detecting our hardware ... | 1463 | * of detecting our hardware ... |
1464 | */ | 1464 | */ |
1465 | card = snd_card_new(index[idx], id[idx], THIS_MODULE, | 1465 | ret = snd_card_create(index[idx], id[idx], THIS_MODULE, |
1466 | sizeof(struct soundscape)); | 1466 | sizeof(struct soundscape), &card); |
1467 | if (!card) | 1467 | if (ret < 0) |
1468 | return -ENOMEM; | 1468 | return ret; |
1469 | 1469 | ||
1470 | sscape = get_card_soundscape(card); | 1470 | sscape = get_card_soundscape(card); |
1471 | 1471 | ||