hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/misc' into for-linus

This commit is contained in:
Takashi Iwai 2009-11-08 09:16:06 +01:00
parent 6fc786d503 f37325a956
commit f645073961
6 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/oss/dmasound/dmasound_core.c
View File

@ -219,7 +219,9 @@ static int shared_resources_initialised;
* Mid level stuff
*/
struct sound_settings dmasound = { .lock = SPIN_LOCK_UNLOCKED };
struct sound_settings dmasound = {
.lock = __SPIN_LOCK_UNLOCKED(dmasound.lock)
};
static inline void sound_silence(void)
{

4
sound/oss/sb_common.c
View File

@ -157,7 +157,7 @@ static void sb_intr (sb_devc *devc)
break;
default:
/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
/* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */
;
}
}
@ -177,7 +177,7 @@ static void sb_intr (sb_devc *devc)
break;
default:
/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
/* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */
;
}
}

2
sound/oss/sb_ess.c
View File

@ -782,7 +782,7 @@ printk(KERN_INFO "FKS: ess_handle_channel %s irq_mode=%d\n", channel, irq_mode);
break;
default:;
/* printk(KERN_WARN "ESS: Unexpected interrupt\n"); */
/* printk(KERN_WARNING "ESS: Unexpected interrupt\n"); */
}
}

6
sound/pci/intel8x0.c
View File

@ -1948,6 +1948,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
.name = "HP xw4200", /* AD1981B*/
.type = AC97_TUNE_HP_ONLY
},
{
.subvendor = 0x104d,
.subdevice = 0x8144,
.name = "Sony",
.type = AC97_TUNE_INV_EAPD
},
{
.subvendor = 0x104d,
.subdevice = 0x8197,

1
sound/sh/aica.c
View File

@ -49,6 +49,7 @@ MODULE_AUTHOR("Adrian McMenamin <adrian@mcmen.demon.co.uk>");
MODULE_DESCRIPTION("Dreamcast AICA sound (pcm) driver");
MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Yamaha/SEGA, AICA}}");
MODULE_FIRMWARE("aica_firmware.bin");
/* module parameters */
#define CARD_NAME "AICA"

2
sound/usb/usbaudio.h
View File

@ -210,7 +210,7 @@ struct snd_usb_midi_endpoint_info {
/*
*/
#define combine_word(s) ((*s) | ((unsigned int)(s)[1] << 8))
#define combine_word(s) ((*(s)) | ((unsigned int)(s)[1] << 8))
#define combine_triple(s) (combine_word(s) | ((unsigned int)(s)[2] << 16))
#define combine_quad(s) (combine_triple(s) | ((unsigned int)(s)[3] << 24))