Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus (7aeb6d7d) · Commits · e / devices / android_kernel_fairphone_FP3

sound/aoa/soundbus/core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -176,7 +176,7 @@ int soundbus_add_one(struct soundbus_dev *dev)
	return -EINVAL;		return -EINVAL;
	}		}

	snprintf(dev->ofdev.dev.bus_id, BUS_ID_SIZE, "soundbus:%x", ++devcount);		dev_set_name(&dev->ofdev.dev, "soundbus:%x", ++devcount);
	dev->ofdev.dev.bus = &soundbus_bus_type;		dev->ofdev.dev.bus = &soundbus_bus_type;
	return of_device_register(&dev->ofdev);		return of_device_register(&dev->ofdev);
	}		}

sound/core/rawmidi.c

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -148,6 +148,8 @@ static int snd_rawmidi_runtime_free(struct snd_rawmidi_substream *substream)

	static inline void snd_rawmidi_output_trigger(struct snd_rawmidi_substream *substream,int up)		static inline void snd_rawmidi_output_trigger(struct snd_rawmidi_substream *substream,int up)
	{		{
			if (!substream->opened)
			return;
	if (up) {		if (up) {
	tasklet_hi_schedule(&substream->runtime->tasklet);		tasklet_hi_schedule(&substream->runtime->tasklet);
	} else {		} else {
	@@ -158,6 +160,8 @@ static inline void snd_rawmidi_output_trigger(struct snd_rawmidi_substream *subs

	static void snd_rawmidi_input_trigger(struct snd_rawmidi_substream *substream, int up)		static void snd_rawmidi_input_trigger(struct snd_rawmidi_substream *substream, int up)
	{		{
			if (!substream->opened)
			return;
	substream->ops->trigger(substream, up);		substream->ops->trigger(substream, up);
	if (!up && substream->runtime->event)		if (!up && substream->runtime->event)
	tasklet_kill(&substream->runtime->tasklet);		tasklet_kill(&substream->runtime->tasklet);
	@@ -857,6 +861,8 @@ int snd_rawmidi_receive(struct snd_rawmidi_substream *substream,
	int result = 0, count1;		int result = 0, count1;
	struct snd_rawmidi_runtime *runtime = substream->runtime;		struct snd_rawmidi_runtime *runtime = substream->runtime;

			if (!substream->opened)
			return -EBADFD;
	if (runtime->buffer == NULL) {		if (runtime->buffer == NULL) {
	snd_printd("snd_rawmidi_receive: input is not active!!!\n");		snd_printd("snd_rawmidi_receive: input is not active!!!\n");
	return -EINVAL;		return -EINVAL;
	@@ -1126,6 +1132,8 @@ int snd_rawmidi_transmit_ack(struct snd_rawmidi_substream *substream, int count)
	int snd_rawmidi_transmit(struct snd_rawmidi_substream *substream,		int snd_rawmidi_transmit(struct snd_rawmidi_substream *substream,
	unsigned char *buffer, int count)		unsigned char *buffer, int count)
	{		{
			if (!substream->opened)
			return -EBADFD;
	count = snd_rawmidi_transmit_peek(substream, buffer, count);		count = snd_rawmidi_transmit_peek(substream, buffer, count);
	if (count < 0)		if (count < 0)
	return count;		return count;

sound/drivers/ml403-ac97cr.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1153,7 +1153,7 @@ snd_ml403_ac97cr_create(struct snd_card card, struct platform_device pfdev,
	/* get irq */		/* get irq */
	irq = platform_get_irq(pfdev, 0);		irq = platform_get_irq(pfdev, 0);
	if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,		if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,
	pfdev->dev.bus_id, (void *)ml403_ac97cr)) {		dev_name(&pfdev->dev), (void *)ml403_ac97cr)) {
	snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "		snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "
	"unable to grab IRQ %d\n",		"unable to grab IRQ %d\n",
	irq);		irq);
	@@ -1166,7 +1166,7 @@ snd_ml403_ac97cr_create(struct snd_card card, struct platform_device pfdev,
	ml403_ac97cr->irq);		ml403_ac97cr->irq);
	irq = platform_get_irq(pfdev, 1);		irq = platform_get_irq(pfdev, 1);
	if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,		if (request_irq(irq, snd_ml403_ac97cr_irq, IRQF_DISABLED,
	pfdev->dev.bus_id, (void *)ml403_ac97cr)) {		dev_name(&pfdev->dev), (void *)ml403_ac97cr)) {
	snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "		snd_printk(KERN_ERR SND_ML403_AC97CR_DRIVER ": "
	"unable to grab IRQ %d\n",		"unable to grab IRQ %d\n",
	irq);		irq);

sound/drivers/pcsp/pcsp_input.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -24,13 +24,13 @@ static void pcspkr_do_sound(unsigned int count)
	spin_lock_irqsave(&i8253_lock, flags);		spin_lock_irqsave(&i8253_lock, flags);

	if (count) {		if (count) {
	/* enable counter 2 */
	outb_p(inb_p(0x61) \| 3, 0x61);
	/* set command for counter 2, 2 byte write */		/* set command for counter 2, 2 byte write */
	outb_p(0xB6, 0x43);		outb_p(0xB6, 0x43);
	/* select desired HZ */		/* select desired HZ */
	outb_p(count & 0xff, 0x42);		outb_p(count & 0xff, 0x42);
	outb((count >> 8) & 0xff, 0x42);		outb((count >> 8) & 0xff, 0x42);
			/* enable counter 2 */
			outb_p(inb_p(0x61) \| 3, 0x61);
	} else {		} else {
	/* disable counter 2 */		/* disable counter 2 */
	outb(inb_p(0x61) & 0xFC, 0x61);		outb(inb_p(0x61) & 0xFC, 0x61);

sound/isa/ad1848/ad1848.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -70,15 +70,15 @@ static int __devinit snd_ad1848_match(struct device *dev, unsigned int n)
	return 0;		return 0;

	if (port[n] == SNDRV_AUTO_PORT) {		if (port[n] == SNDRV_AUTO_PORT) {
	snd_printk(KERN_ERR "%s: please specify port\n", dev->bus_id);		dev_err(dev, "please specify port\n");
	return 0;		return 0;
	}		}
	if (irq[n] == SNDRV_AUTO_IRQ) {		if (irq[n] == SNDRV_AUTO_IRQ) {
	snd_printk(KERN_ERR "%s: please specify irq\n", dev->bus_id);		dev_err(dev, "please specify irq\n");
	return 0;		return 0;
	}		}
	if (dma1[n] == SNDRV_AUTO_DMA) {		if (dma1[n] == SNDRV_AUTO_DMA) {
	snd_printk(KERN_ERR "%s: please specify dma1\n", dev->bus_id);		dev_err(dev, "please specify dma1\n");
	return 0;		return 0;
	}		}
	return 1;		return 1;