diff options
author | James Morris <jmorris@namei.org> | 2009-03-27 08:28:11 +1100 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-03-27 08:28:11 +1100 |
commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /sound/spi | |
parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) |
Merge branch 'master' into next
Diffstat (limited to 'sound/spi')
-rw-r--r-- | sound/spi/at73c213.c | 7 |
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; |