diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 10:06:05 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:27:22 -0500 |
commit | 0ed1cad172176a4595f82e8cd9055938ad54bd4b (patch) | |
tree | b00296e5a061c90debfc4fa8c5303f75042456bc /sound/pcmcia/vx | |
parent | 597c3c96691c861e837f9024084b4943fa5fc0fd (diff) |
[ALSA] vx-driver - Fix PM support
Fix PM support on VX drivers (vxpocket and vx222).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pcmcia/vx')
-rw-r--r-- | sound/pcmcia/vx/vxpocket.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c index 009629714140..5bb079d17959 100644 --- a/sound/pcmcia/vx/vxpocket.c +++ b/sound/pcmcia/vx/vxpocket.c | |||
@@ -342,9 +342,9 @@ static int vxpocket_event(event_t event, int priority, event_callback_args_t *ar | |||
342 | case CS_EVENT_PM_SUSPEND: | 342 | case CS_EVENT_PM_SUSPEND: |
343 | snd_printdd(KERN_DEBUG "SUSPEND\n"); | 343 | snd_printdd(KERN_DEBUG "SUSPEND\n"); |
344 | link->state |= DEV_SUSPEND; | 344 | link->state |= DEV_SUSPEND; |
345 | if (chip && chip->card->pm_suspend) { | 345 | if (chip) { |
346 | snd_printdd(KERN_DEBUG "snd_vx_suspend calling\n"); | 346 | snd_printdd(KERN_DEBUG "snd_vx_suspend calling\n"); |
347 | chip->card->pm_suspend(chip->card, PMSG_SUSPEND); | 347 | snd_vx_suspend(chip, PMSG_SUSPEND); |
348 | } | 348 | } |
349 | /* Fall through... */ | 349 | /* Fall through... */ |
350 | case CS_EVENT_RESET_PHYSICAL: | 350 | case CS_EVENT_RESET_PHYSICAL: |
@@ -362,9 +362,9 @@ static int vxpocket_event(event_t event, int priority, event_callback_args_t *ar | |||
362 | //struct snd_vxpocket *vxp = (struct snd_vxpocket *)chip; | 362 | //struct snd_vxpocket *vxp = (struct snd_vxpocket *)chip; |
363 | snd_printdd(KERN_DEBUG "requestconfig...\n"); | 363 | snd_printdd(KERN_DEBUG "requestconfig...\n"); |
364 | pcmcia_request_configuration(link->handle, &link->conf); | 364 | pcmcia_request_configuration(link->handle, &link->conf); |
365 | if (chip && chip->card->pm_resume) { | 365 | if (chip) { |
366 | snd_printdd(KERN_DEBUG "calling snd_vx_resume\n"); | 366 | snd_printdd(KERN_DEBUG "calling snd_vx_resume\n"); |
367 | chip->card->pm_resume(chip->card); | 367 | snd_vx_resume(chip); |
368 | } | 368 | } |
369 | } | 369 | } |
370 | snd_printdd(KERN_DEBUG "resume done!\n"); | 370 | snd_printdd(KERN_DEBUG "resume done!\n"); |
@@ -407,6 +407,7 @@ static dev_link_t *vxpocket_attach(void) | |||
407 | snd_card_free(card); | 407 | snd_card_free(card); |
408 | return NULL; | 408 | return NULL; |
409 | } | 409 | } |
410 | card->private_data = vxp; | ||
410 | 411 | ||
411 | vxp->index = i; | 412 | vxp->index = i; |
412 | card_alloc |= 1 << i; | 413 | card_alloc |= 1 << i; |