Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'fix/misc' into for-linus

parents 6fc786d5 f37325a9

sound/oss/dmasound/dmasound_core.c

+3 −1
Original line number Diff line number Diff line
@@ -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)

{

sound/oss/sb_common.c

+2 −2
Original line number Diff line number Diff line
@@ -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"); */

				;

		}

	}

sound/oss/sb_ess.c

+1 −1
Original line number Diff line number Diff line
@@ -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"); */

	}

}

sound/pci/intel8x0.c

+6 −0
Original line number Diff line number Diff line
@@ -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,

sound/sh/aica.c

+1 −0
Original line number Diff line number Diff line
@@ -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"