aboutsummaryrefslogtreecommitdiff
path: root/sound/spi/at73c213.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-02-19 10:22:14 +0100
committerTakashi Iwai <tiwai@suse.de>2009-02-19 10:22:14 +0100
commita5e0e970c06065a14844b406a0c2a59776a1ccc6 (patch)
tree1da3f4aac02e29f0dfbd099b17412011ca950cb8 /sound/spi/at73c213.c
parent6ce6c473a7fd742fdb0db95841e2c4c6b37337c5 (diff)
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff)
Merge branch 'topic/snd_card_new-err' into topic/oxygen
Diffstat (limited to 'sound/spi/at73c213.c')
-rw-r--r--sound/spi/at73c213.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/spi/at73c213.c b/sound/spi/at73c213.c
index 09802e8a6fb..4c7b051f9d1 100644
--- a/sound/spi/at73c213.c
+++ b/sound/spi/at73c213.c
@@ -965,12 +965,11 @@ static int __devinit snd_at73c213_probe(struct spi_device *spi)
return PTR_ERR(board->dac_clk);
}
- retval = -ENOMEM;
-
/* Allocate "card" using some unused identifiers. */
snprintf(id, sizeof id, "at73c213_%d", board->ssc_id);
- card = snd_card_new(-1, id, THIS_MODULE, sizeof(struct snd_at73c213));
- if (!card)
+ retval = snd_card_create(-1, id, THIS_MODULE,
+ sizeof(struct snd_at73c213), &card);
+ if (retval < 0)
goto out;
chip = card->private_data;