lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix/misc' into topic/misc

Browse Source 
Conflicts:
	sound/pci/hda/patch_realtek.c
This commit is contained in:
Takashi Iwai
2010-02-17 14:24:46 +01:00
parent 291186e049 9d3415a8cc
commit 7fb3a069bc
1419 changed files with 35700 additions and 13836 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sound/core/pcm_native.c
View File

@ -316,10 +316,10 @@ int snd_pcm_hw_refine(struct snd_pcm_substream *substream,
if (!params->info)
params->info = hw->info & ~SNDRV_PCM_INFO_FIFO_IN_FRAMES;
if (!params->fifo_size) {
if (snd_mask_min(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT]) ==
snd_mask_max(&params->masks[SNDRV_PCM_HW_PARAM_FORMAT]) &&
snd_mask_min(&params->masks[SNDRV_PCM_HW_PARAM_CHANNELS]) ==
snd_mask_max(&params->masks[SNDRV_PCM_HW_PARAM_CHANNELS])) {
m = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
i = hw_param_interval(params, SNDRV_PCM_HW_PARAM_CHANNELS);
if (snd_mask_min(m) == snd_mask_max(m) &&
snd_interval_min(i) == snd_interval_max(i)) {
changed = substream->ops->ioctl(substream,
SNDRV_PCM_IOCTL1_FIFO_SIZE, params);
if (changed < 0)

4
sound/core/sound.c
View File

@ -468,5 +468,5 @@ static void __exit alsa_sound_exit(void)
unregister_chrdev(major, "alsa");
}
module_init(alsa_sound_init)
module_exit(alsa_sound_exit)
subsys_initcall(alsa_sound_init);
module_exit(alsa_sound_exit);

2
sound/core/sound_oss.c
View File

@ -93,7 +93,7 @@ static int snd_oss_kernel_minor(int type, struct snd_card *card, int dev)
default:
return -EINVAL;
}
if (snd_BUG_ON(minor < 0 || minor >= SNDRV_OSS_MINORS))
if (minor < 0 || minor >= SNDRV_OSS_MINORS)
return -EINVAL;
return minor;
}