diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-05 17:08:33 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-05 17:08:33 +0300 |
commit | 6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7 (patch) | |
tree | 2d6a9fdb99ddd1fb61fac029a4e04ac96e12c179 /sound/pci/atiixp_modem.c | |
parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
download | linux-6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7.tar.xz |
Merge branch 'topic/snd_card_new-err' into topic/atmel
Diffstat (limited to 'sound/pci/atiixp_modem.c')
-rw-r--r-- | sound/pci/atiixp_modem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index 0e6e5cc1c501..c3136cccc559 100644 --- a/sound/pci/atiixp_modem.c +++ b/sound/pci/atiixp_modem.c @@ -1288,9 +1288,9 @@ static int __devinit snd_atiixp_probe(struct pci_dev *pci, struct atiixp_modem *chip; int err; - card = snd_card_new(index, id, THIS_MODULE, 0); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(index, id, THIS_MODULE, 0, &card); + if (err < 0) + return err; strcpy(card->driver, "ATIIXP-MODEM"); strcpy(card->shortname, "ATI IXP Modem"); |