diff options
Diffstat (limited to 'sound/pci/ctxfi/cthw20k1.c')
-rw-r--r-- | sound/pci/ctxfi/cthw20k1.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sound/pci/ctxfi/cthw20k1.c b/sound/pci/ctxfi/cthw20k1.c index a5c957db5ce..a7df19791f5 100644 --- a/sound/pci/ctxfi/cthw20k1.c +++ b/sound/pci/ctxfi/cthw20k1.c | |||
@@ -1777,10 +1777,17 @@ static int hw_adc_init(struct hw *hw, const struct adc_conf *info) | |||
1777 | return adc_init_SBx(hw, info->input, info->mic20db); | 1777 | return adc_init_SBx(hw, info->input, info->mic20db); |
1778 | } | 1778 | } |
1779 | 1779 | ||
1780 | static int hw_have_digit_io_switch(struct hw *hw) | 1780 | static struct capabilities hw_capabilities(struct hw *hw) |
1781 | { | 1781 | { |
1782 | struct capabilities cap; | ||
1783 | |||
1782 | /* SB073x and Vista compatible cards have no digit IO switch */ | 1784 | /* SB073x and Vista compatible cards have no digit IO switch */ |
1783 | return !(hw->model == CTSB073X || hw->model == CTUAA); | 1785 | cap.digit_io_switch = !(hw->model == CTSB073X || hw->model == CTUAA); |
1786 | cap.dedicated_mic = 0; | ||
1787 | cap.output_switch = 0; | ||
1788 | cap.mic_source_switch = 0; | ||
1789 | |||
1790 | return cap; | ||
1784 | } | 1791 | } |
1785 | 1792 | ||
1786 | #define CTLBITS(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) | 1793 | #define CTLBITS(a, b, c, d) (((a) << 24) | ((b) << 16) | ((c) << 8) | (d)) |
@@ -1933,7 +1940,7 @@ static int hw_card_start(struct hw *hw) | |||
1933 | 1940 | ||
1934 | if (hw->irq < 0) { | 1941 | if (hw->irq < 0) { |
1935 | err = request_irq(pci->irq, ct_20k1_interrupt, IRQF_SHARED, | 1942 | err = request_irq(pci->irq, ct_20k1_interrupt, IRQF_SHARED, |
1936 | "ctxfi", hw); | 1943 | KBUILD_MODNAME, hw); |
1937 | if (err < 0) { | 1944 | if (err < 0) { |
1938 | printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq); | 1945 | printk(KERN_ERR "XFi: Cannot get irq %d\n", pci->irq); |
1939 | goto error2; | 1946 | goto error2; |
@@ -2172,7 +2179,7 @@ static struct hw ct20k1_preset __devinitdata = { | |||
2172 | .pll_init = hw_pll_init, | 2179 | .pll_init = hw_pll_init, |
2173 | .is_adc_source_selected = hw_is_adc_input_selected, | 2180 | .is_adc_source_selected = hw_is_adc_input_selected, |
2174 | .select_adc_source = hw_adc_input_select, | 2181 | .select_adc_source = hw_adc_input_select, |
2175 | .have_digit_io_switch = hw_have_digit_io_switch, | 2182 | .capabilities = hw_capabilities, |
2176 | #ifdef CONFIG_PM | 2183 | #ifdef CONFIG_PM |
2177 | .suspend = hw_suspend, | 2184 | .suspend = hw_suspend, |
2178 | .resume = hw_resume, | 2185 | .resume = hw_resume, |