diff options
Diffstat (limited to 'sound/pci/oxygen/oxygen.c')
-rw-r--r-- | sound/pci/oxygen/oxygen.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/pci/oxygen/oxygen.c b/sound/pci/oxygen/oxygen.c index 62888c7b61d4..b60f6212745a 100644 --- a/sound/pci/oxygen/oxygen.c +++ b/sound/pci/oxygen/oxygen.c | |||
@@ -204,6 +204,11 @@ static void generic_resume(struct oxygen *chip) | |||
204 | wm8785_registers_init(chip); | 204 | wm8785_registers_init(chip); |
205 | } | 205 | } |
206 | 206 | ||
207 | static void meridian_resume(struct oxygen *chip) | ||
208 | { | ||
209 | ak4396_registers_init(chip); | ||
210 | } | ||
211 | |||
207 | static void set_ak4396_params(struct oxygen *chip, | 212 | static void set_ak4396_params(struct oxygen *chip, |
208 | struct snd_pcm_hw_params *params) | 213 | struct snd_pcm_hw_params *params) |
209 | { | 214 | { |
@@ -290,7 +295,7 @@ static int generic_probe(struct oxygen *chip, unsigned long driver_data) | |||
290 | { | 295 | { |
291 | if (driver_data == MODEL_MERIDIAN) { | 296 | if (driver_data == MODEL_MERIDIAN) { |
292 | chip->model.init = meridian_init; | 297 | chip->model.init = meridian_init; |
293 | chip->model.resume = ak4396_registers_init; | 298 | chip->model.resume = meridian_resume; |
294 | chip->model.set_adc_params = set_ak5385_params; | 299 | chip->model.set_adc_params = set_ak5385_params; |
295 | chip->model.device_config = PLAYBACK_0_TO_I2S | | 300 | chip->model.device_config = PLAYBACK_0_TO_I2S | |
296 | PLAYBACK_1_TO_SPDIF | | 301 | PLAYBACK_1_TO_SPDIF | |