Merge branch 'fix/misc' into for-linus
This commit is contained in:
commit
1440566f2d
|
@ -157,7 +157,7 @@ static void resample_shrink(struct snd_pcm_plugin *plugin,
|
|||
while (dst_frames1 > 0) {
|
||||
S1 = S2;
|
||||
if (src_frames1-- > 0) {
|
||||
S1 = *src;
|
||||
S2 = *src;
|
||||
src += src_step;
|
||||
}
|
||||
if (pos & ~R_MASK) {
|
||||
|
|
|
@ -165,7 +165,7 @@ module_param_array(enable, bool, NULL, 0444);
|
|||
MODULE_PARM_DESC(enable, "Enable Audiowerk2 soundcard.");
|
||||
|
||||
static struct pci_device_id snd_aw2_ids[] = {
|
||||
{PCI_VENDOR_ID_SAA7146, PCI_DEVICE_ID_SAA7146, PCI_ANY_ID, PCI_ANY_ID,
|
||||
{PCI_VENDOR_ID_SAA7146, PCI_DEVICE_ID_SAA7146, 0, 0,
|
||||
0, 0, 0},
|
||||
{0}
|
||||
};
|
||||
|
|
|
@ -1528,6 +1528,7 @@ static struct snd_emu_chip_details emu_chip_details[] = {
|
|||
.ca0151_chip = 1,
|
||||
.spk71 = 1,
|
||||
.spdif_bug = 1,
|
||||
.invert_shared_spdif = 1, /* digital/analog switch swapped */
|
||||
.ac97_chip = 1} ,
|
||||
{.vendor = 0x1102, .device = 0x0004, .subsystem = 0x10021102,
|
||||
.driver = "Audigy2", .name = "SB Audigy 2 Platinum [SB0240P]",
|
||||
|
|
|
@ -97,12 +97,12 @@ struct pcxhr_mgr {
|
|||
int capture_chips;
|
||||
int fw_file_set;
|
||||
int firmware_num;
|
||||
int is_hr_stereo:1;
|
||||
int board_has_aes1:1; /* if 1 board has AES1 plug and SRC */
|
||||
int board_has_analog:1; /* if 0 the board is digital only */
|
||||
int board_has_mic:1; /* if 1 the board has microphone input */
|
||||
int board_aes_in_192k:1;/* if 1 the aes input plugs do support 192kHz */
|
||||
int mono_capture:1; /* if 1 the board does mono capture */
|
||||
unsigned int is_hr_stereo:1;
|
||||
unsigned int board_has_aes1:1; /* if 1 board has AES1 plug and SRC */
|
||||
unsigned int board_has_analog:1; /* if 0 the board is digital only */
|
||||
unsigned int board_has_mic:1; /* if 1 the board has microphone input */
|
||||
unsigned int board_aes_in_192k:1;/* if 1 the aes input plugs do support 192kHz */
|
||||
unsigned int mono_capture:1; /* if 1 the board does mono capture */
|
||||
|
||||
struct snd_dma_buffer hostport;
|
||||
|
||||
|
|
Loading…
Reference in a new issue