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/spi | |
parent | 4c9f1d3ed7e5f910b66dc4d1456cfac17e58cf0e (diff) | |
parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) |
Merge branch 'topic/snd_card_new-err' into topic/cs423x-merge
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 09802e8a6fb8..4c7b051f9d17 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) | |||
965 | return PTR_ERR(board->dac_clk); | 965 | return PTR_ERR(board->dac_clk); |
966 | } | 966 | } |
967 | 967 | ||
968 | retval = -ENOMEM; | ||
969 | |||
970 | /* Allocate "card" using some unused identifiers. */ | 968 | /* Allocate "card" using some unused identifiers. */ |
971 | snprintf(id, sizeof id, "at73c213_%d", board->ssc_id); | 969 | snprintf(id, sizeof id, "at73c213_%d", board->ssc_id); |
972 | card = snd_card_new(-1, id, THIS_MODULE, sizeof(struct snd_at73c213)); | 970 | retval = snd_card_create(-1, id, THIS_MODULE, |
973 | if (!card) | 971 | sizeof(struct snd_at73c213), &card); |
972 | if (retval < 0) | ||
974 | goto out; | 973 | goto out; |
975 | 974 | ||
976 | chip = card->private_data; | 975 | chip = card->private_data; |