diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-28 16:29:51 -0400 |
| commit | ed40d0c472b136682b2fcba05f89762859c7374f (patch) | |
| tree | 076b83a26bcd63d6158463735dd34c10bbc591dc /sound/arm/pxa2xx-ac97.c | |
| parent | 9e495834e59ca9b29f1a1f63b9f5533bb022ac49 (diff) | |
| parent | 5d80f8e5a9dc9c9a94d4aeaa567e219a808b8a4a (diff) | |
Merge branch 'origin' into devel
Conflicts:
sound/soc/pxa/pxa2xx-i2s.c
Diffstat (limited to 'sound/arm/pxa2xx-ac97.c')
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index ccec48fc8e3f..c570ebd9d177 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
| @@ -171,10 +171,9 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev) | |||
| 171 | struct snd_ac97_template ac97_template; | 171 | struct snd_ac97_template ac97_template; |
| 172 | int ret; | 172 | int ret; |
| 173 | 173 | ||
| 174 | ret = -ENOMEM; | 174 | ret = snd_card_create(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, |
| 175 | card = snd_card_new(SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1, | 175 | THIS_MODULE, 0, &card); |
| 176 | THIS_MODULE, 0); | 176 | if (ret < 0) |
| 177 | if (!card) | ||
| 178 | goto err; | 177 | goto err; |
| 179 | 178 | ||
| 180 | card->dev = &dev->dev; | 179 | card->dev = &dev->dev; |