diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2006-07-25 16:13:37 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-08-03 15:21:22 +0200 |
| commit | 6e8331ac6973435b1e7604c30f2ad394035b46e1 (patch) | |
| tree | 4b63bacad2644aea8770961bd08da7a84dfbbbb3 | |
| parent | 2566d36ab4f0b90141bb59a5f7342255751fbf45 (diff) | |
| download | op-kernel-dev-6e8331ac6973435b1e7604c30f2ad394035b46e1.zip op-kernel-dev-6e8331ac6973435b1e7604c30f2ad394035b46e1.tar.gz | |
[ALSA] aoa: fix toonie codec
This patch fixes the toonie codec to be actually usable.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| -rw-r--r-- | sound/aoa/codecs/snd-aoa-codec-toonie.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sound/aoa/codecs/snd-aoa-codec-toonie.c b/sound/aoa/codecs/snd-aoa-codec-toonie.c index bcc5556..3c7d1d8 100644 --- a/sound/aoa/codecs/snd-aoa-codec-toonie.c +++ b/sound/aoa/codecs/snd-aoa-codec-toonie.c @@ -51,6 +51,13 @@ static struct transfer_info toonie_transfers[] = { {} }; +static int toonie_usable(struct codec_info_item *cii, + struct transfer_info *ti, + struct transfer_info *out) +{ + return 1; +} + #ifdef CONFIG_PM static int toonie_suspend(struct codec_info_item *cii, pm_message_t state) { @@ -69,6 +76,7 @@ static struct codec_info toonie_codec_info = { .sysclock_factor = 256, .bus_factor = 64, .owner = THIS_MODULE, + .usable = toonie_usable, #ifdef CONFIG_PM .suspend = toonie_suspend, .resume = toonie_resume, @@ -79,19 +87,20 @@ static int toonie_init_codec(struct aoa_codec *codec) { struct toonie *toonie = codec_to_toonie(codec); + /* nothing connected? what a joke! */ + if (toonie->codec.connected != 1) + return -ENOTCONN; + if (aoa_snd_device_new(SNDRV_DEV_LOWLEVEL, toonie, &ops)) { printk(KERN_ERR PFX "failed to create toonie snd device!\n"); return -ENODEV; } - /* nothing connected? what a joke! */ - if (toonie->codec.connected != 1) - return -ENOTCONN; - if (toonie->codec.soundbus_dev->attach_codec(toonie->codec.soundbus_dev, aoa_get_card(), &toonie_codec_info, toonie)) { printk(KERN_ERR PFX "error creating toonie pcm\n"); + snd_device_free(aoa_get_card(), toonie); return -ENODEV; } |
