Commit f6450739 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/misc' into for-linus

parents 6fc786d5 f37325a9
...@@ -219,7 +219,9 @@ static int shared_resources_initialised; ...@@ -219,7 +219,9 @@ static int shared_resources_initialised;
* Mid level stuff * 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) static inline void sound_silence(void)
{ {
......
...@@ -157,7 +157,7 @@ static void sb_intr (sb_devc *devc) ...@@ -157,7 +157,7 @@ static void sb_intr (sb_devc *devc)
break; break;
default: 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) ...@@ -177,7 +177,7 @@ static void sb_intr (sb_devc *devc)
break; break;
default: default:
/* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */ /* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */
; ;
} }
} }
......
...@@ -782,7 +782,7 @@ printk(KERN_INFO "FKS: ess_handle_channel %s irq_mode=%d\n", channel, irq_mode); ...@@ -782,7 +782,7 @@ printk(KERN_INFO "FKS: ess_handle_channel %s irq_mode=%d\n", channel, irq_mode);
break; break;
default:; default:;
/* printk(KERN_WARN "ESS: Unexpected interrupt\n"); */ /* printk(KERN_WARNING "ESS: Unexpected interrupt\n"); */
} }
} }
......
...@@ -1948,6 +1948,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = { ...@@ -1948,6 +1948,12 @@ static struct ac97_quirk ac97_quirks[] __devinitdata = {
.name = "HP xw4200", /* AD1981B*/ .name = "HP xw4200", /* AD1981B*/
.type = AC97_TUNE_HP_ONLY .type = AC97_TUNE_HP_ONLY
}, },
{
.subvendor = 0x104d,
.subdevice = 0x8144,
.name = "Sony",
.type = AC97_TUNE_INV_EAPD
},
{ {
.subvendor = 0x104d, .subvendor = 0x104d,
.subdevice = 0x8197, .subdevice = 0x8197,
......
...@@ -49,6 +49,7 @@ MODULE_AUTHOR("Adrian McMenamin <adrian@mcmen.demon.co.uk>"); ...@@ -49,6 +49,7 @@ MODULE_AUTHOR("Adrian McMenamin <adrian@mcmen.demon.co.uk>");
MODULE_DESCRIPTION("Dreamcast AICA sound (pcm) driver"); MODULE_DESCRIPTION("Dreamcast AICA sound (pcm) driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Yamaha/SEGA, AICA}}"); MODULE_SUPPORTED_DEVICE("{{Yamaha/SEGA, AICA}}");
MODULE_FIRMWARE("aica_firmware.bin");
/* module parameters */ /* module parameters */
#define CARD_NAME "AICA" #define CARD_NAME "AICA"
......
...@@ -210,7 +210,7 @@ struct snd_usb_midi_endpoint_info { ...@@ -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_triple(s) (combine_word(s) | ((unsigned int)(s)[2] << 16))
#define combine_quad(s) (combine_triple(s) | ((unsigned int)(s)[3] << 24)) #define combine_quad(s) (combine_triple(s) | ((unsigned int)(s)[3] << 24))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment