Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ALSA] aoa: fix toonie codec

Browse source 
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>
This commit is contained in:
Johannes Berg 2006-07-25 16:13:37 +02:00 committed by Jaroslav Kysela
parent 2566d36ab4
commit 6e8331ac69
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sound/aoa/codecs/snd-aoa-codec-toonie.c
View file

@ -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 #ifdef CONFIG_PM
static int toonie_suspend(struct codec_info_item *cii, pm_message_t state) 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, .sysclock_factor = 256,
.bus_factor = 64, .bus_factor = 64,
.owner = THIS_MODULE, .owner = THIS_MODULE,
.usable = toonie_usable,
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = toonie_suspend, .suspend = toonie_suspend,
.resume = toonie_resume, .resume = toonie_resume,
@ -79,19 +87,20 @@ static int toonie_init_codec(struct aoa_codec *codec)
{ {
struct toonie *toonie = codec_to_toonie(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)) { if (aoa_snd_device_new(SNDRV_DEV_LOWLEVEL, toonie, &ops)) {
printk(KERN_ERR PFX "failed to create toonie snd device!\n"); printk(KERN_ERR PFX "failed to create toonie snd device!\n");
return -ENODEV; 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, if (toonie->codec.soundbus_dev->attach_codec(toonie->codec.soundbus_dev,
aoa_get_card(), aoa_get_card(),
&toonie_codec_info, toonie)) { &toonie_codec_info, toonie)) {
printk(KERN_ERR PFX "error creating toonie pcm\n"); printk(KERN_ERR PFX "error creating toonie pcm\n");
snd_device_free(aoa_get_card(), toonie);
return -ENODEV; return -ENODEV;
} }