From 4e2bf6d19b9c6cc86f26181eda360b1aa9e0cb56 Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Sun, 17 Jul 2011 22:18:05 +0200 Subject: [PATCH] --- yaml --- r: 257627 b: refs/heads/master c: c81c6b356b52d3fcb4d531d149573fc100aad643 h: refs/heads/master i: 257625: 03eb2511297f097d56eed1a40c2a3cae148edae4 257623: 5c30a53cf197641509972e13bba376ee94a0e80c v: v3 --- [refs] | 2 +- trunk/sound/pci/oxygen/xonar_pcm179x.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1c21fe7e55e6..3c30191431eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f21169aa876b3a26c0a95a70724886ca03998870 +refs/heads/master: c81c6b356b52d3fcb4d531d149573fc100aad643 diff --git a/trunk/sound/pci/oxygen/xonar_pcm179x.c b/trunk/sound/pci/oxygen/xonar_pcm179x.c index 54cad38ec30a..32d096c98f5b 100644 --- a/trunk/sound/pci/oxygen/xonar_pcm179x.c +++ b/trunk/sound/pci/oxygen/xonar_pcm179x.c @@ -327,8 +327,10 @@ static void pcm1796_init(struct oxygen *chip) { struct xonar_pcm179x *data = chip->model_data; - data->pcm1796_regs[0][18 - PCM1796_REG_BASE] = PCM1796_MUTE | + data->pcm1796_regs[0][18 - PCM1796_REG_BASE] = PCM1796_DMF_DISABLED | PCM1796_FMT_24_I2S | PCM1796_ATLD; + if (!data->broken_i2c) + data->pcm1796_regs[0][18 - PCM1796_REG_BASE] |= PCM1796_MUTE; data->pcm1796_regs[0][19 - PCM1796_REG_BASE] = PCM1796_FLT_SHARP | PCM1796_ATS_1; data->pcm1796_regs[0][20 - PCM1796_REG_BASE] = @@ -1123,6 +1125,7 @@ int __devinit get_xonar_pcm179x_model(struct oxygen *chip, chip->model.control_filter = xonar_st_h6_control_filter; chip->model.dac_channels_pcm = 8; chip->model.dac_channels_mixer = 8; + chip->model.dac_volume_min = 255; chip->model.dac_mclks = OXYGEN_MCLKS(256, 128, 128); break; }