diff options
Diffstat (limited to 'sound/pci/echoaudio/gina24_dsp.c')
-rw-r--r-- | sound/pci/echoaudio/gina24_dsp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/pci/echoaudio/gina24_dsp.c b/sound/pci/echoaudio/gina24_dsp.c index 093dd7ba0e81..98f7cfa81b5f 100644 --- a/sound/pci/echoaudio/gina24_dsp.c +++ b/sound/pci/echoaudio/gina24_dsp.c | |||
@@ -57,9 +57,6 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) | |||
57 | ECHO_CLOCK_BIT_INTERNAL | ECHO_CLOCK_BIT_SPDIF | | 57 | ECHO_CLOCK_BIT_INTERNAL | ECHO_CLOCK_BIT_SPDIF | |
58 | ECHO_CLOCK_BIT_ESYNC | ECHO_CLOCK_BIT_ESYNC96 | | 58 | ECHO_CLOCK_BIT_ESYNC | ECHO_CLOCK_BIT_ESYNC96 | |
59 | ECHO_CLOCK_BIT_ADAT; | 59 | ECHO_CLOCK_BIT_ADAT; |
60 | chip->professional_spdif = FALSE; | ||
61 | chip->digital_in_automute = TRUE; | ||
62 | chip->digital_mode = DIGITAL_MODE_SPDIF_RCA; | ||
63 | 60 | ||
64 | /* Gina24 comes in both '301 and '361 flavors */ | 61 | /* Gina24 comes in both '301 and '361 flavors */ |
65 | if (chip->device_id == DEVICE_ID_56361) { | 62 | if (chip->device_id == DEVICE_ID_56361) { |
@@ -81,19 +78,22 @@ static int init_hw(struct echoaudio *chip, u16 device_id, u16 subdevice_id) | |||
81 | return err; | 78 | return err; |
82 | chip->bad_board = FALSE; | 79 | chip->bad_board = FALSE; |
83 | 80 | ||
84 | if ((err = init_line_levels(chip)) < 0) | ||
85 | return err; | ||
86 | err = set_digital_mode(chip, DIGITAL_MODE_SPDIF_RCA); | ||
87 | if (err < 0) | ||
88 | return err; | ||
89 | err = set_professional_spdif(chip, TRUE); | ||
90 | |||
91 | DE_INIT(("init_hw done\n")); | 81 | DE_INIT(("init_hw done\n")); |
92 | return err; | 82 | return err; |
93 | } | 83 | } |
94 | 84 | ||
95 | 85 | ||
96 | 86 | ||
87 | static int set_mixer_defaults(struct echoaudio *chip) | ||
88 | { | ||
89 | chip->digital_mode = DIGITAL_MODE_SPDIF_RCA; | ||
90 | chip->professional_spdif = FALSE; | ||
91 | chip->digital_in_automute = TRUE; | ||
92 | return init_line_levels(chip); | ||
93 | } | ||
94 | |||
95 | |||
96 | |||
97 | static u32 detect_input_clocks(const struct echoaudio *chip) | 97 | static u32 detect_input_clocks(const struct echoaudio *chip) |
98 | { | 98 | { |
99 | u32 clocks_from_dsp, clock_bits; | 99 | u32 clocks_from_dsp, clock_bits; |