Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 170095
b: refs/heads/master
c: 50d40f1
h: refs/heads/master
i:
  170093: 5a6396e
  170091: 100b055
  170087: b86f8d9
  170079: a5c2254
v: v3
  • Loading branch information
Aleksey Kunitskiy authored and Takashi Iwai committed Nov 14, 2009
1 parent fe3b012 commit fc168e0
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 401de8184a4d94688962b9258fe10ab309ffda9c
refs/heads/master: 50d40f187f9182ee8caa1b83f80a0e11e2226baa
32 changes: 32 additions & 0 deletions trunk/sound/pci/ice1712/juli.c
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,31 @@ static int __devinit juli_add_controls(struct snd_ice1712 *ice)
return 0;
}

/*
* suspend/resume
* */

#ifdef CONFIG_PM
static int juli_resume(struct snd_ice1712 *ice)
{
struct snd_akm4xxx *ak = ice->akm;
struct juli_spec *spec = ice->spec;
/* akm4358 un-reset, un-mute */
snd_akm4xxx_reset(ak, 0);
/* reinit ak4114 */
snd_ak4114_reinit(spec->ak4114);
return 0;
}

static int juli_suspend(struct snd_ice1712 *ice)
{
struct snd_akm4xxx *ak = ice->akm;
/* akm4358 reset and soft-mute */
snd_akm4xxx_reset(ak, 1);
return 0;
}
#endif

/*
* initialize the chip
*/
Expand Down Expand Up @@ -646,6 +671,13 @@ static int __devinit juli_init(struct snd_ice1712 *ice)
ice->set_spdif_clock = juli_set_spdif_clock;

ice->spdif.ops.open = juli_spdif_in_open;

#ifdef CONFIG_PM
ice->pm_resume = juli_resume;
ice->pm_suspend = juli_suspend;
ice->pm_suspend_enabled = 1;
#endif

return 0;
}

Expand Down

0 comments on commit fc168e0

Please sign in to comment.