diff options
Diffstat (limited to 'sound/pcmcia/pdaudiocf/pdaudiocf.c')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c index 0ba335d045f8..a7cd2d4df757 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c | |||
@@ -217,8 +217,6 @@ static int snd_pdacf_assign_resources(struct snd_pdacf *pdacf, int port, int irq | |||
217 | if (err < 0) | 217 | if (err < 0) |
218 | return err; | 218 | return err; |
219 | 219 | ||
220 | snd_card_set_pm_callback(card, snd_pdacf_suspend, snd_pdacf_resume, pdacf); | ||
221 | |||
222 | if ((err = snd_card_register(card)) < 0) | 220 | if ((err = snd_card_register(card)) < 0) |
223 | return err; | 221 | return err; |
224 | 222 | ||
@@ -339,7 +337,7 @@ static int pdacf_event(event_t event, int priority, event_callback_args_t *args) | |||
339 | link->state |= DEV_SUSPEND; | 337 | link->state |= DEV_SUSPEND; |
340 | if (chip) { | 338 | if (chip) { |
341 | snd_printdd(KERN_DEBUG "snd_pdacf_suspend calling\n"); | 339 | snd_printdd(KERN_DEBUG "snd_pdacf_suspend calling\n"); |
342 | snd_pdacf_suspend(chip->card, PMSG_SUSPEND); | 340 | snd_pdacf_suspend(chip, PMSG_SUSPEND); |
343 | } | 341 | } |
344 | /* Fall through... */ | 342 | /* Fall through... */ |
345 | case CS_EVENT_RESET_PHYSICAL: | 343 | case CS_EVENT_RESET_PHYSICAL: |
@@ -358,7 +356,7 @@ static int pdacf_event(event_t event, int priority, event_callback_args_t *args) | |||
358 | pcmcia_request_configuration(link->handle, &link->conf); | 356 | pcmcia_request_configuration(link->handle, &link->conf); |
359 | if (chip) { | 357 | if (chip) { |
360 | snd_printdd(KERN_DEBUG "calling snd_pdacf_resume\n"); | 358 | snd_printdd(KERN_DEBUG "calling snd_pdacf_resume\n"); |
361 | snd_pdacf_resume(chip->card); | 359 | snd_pdacf_resume(chip); |
362 | } | 360 | } |
363 | } | 361 | } |
364 | snd_printdd(KERN_DEBUG "resume done!\n"); | 362 | snd_printdd(KERN_DEBUG "resume done!\n"); |