Merge branch 'topic/fix/misc' into topic/misc (63cf123b) · Commits · e / devices / android_kernel_xiaomi_markw

include/sound/core.h

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -388,9 +388,13 @@ void snd_verbose_printd(const char file, int line, const char format, ...)

	#else /* !CONFIG_SND_DEBUG */		#else /* !CONFIG_SND_DEBUG */

	#define snd_printd(fmt, args...) /* nothing */		#define snd_printd(fmt, args...) do { } while (0)
	#define snd_BUG() /* nothing */		#define snd_BUG() do { } while (0)
	#define snd_BUG_ON(cond) ({/(void)(cond);/ 0;}) /* always false */		static inline int __snd_bug_on(void)
			{
			return 0;
			}
			#define snd_BUG_ON(cond) __snd_bug_on() /* always false */

	#endif /* CONFIG_SND_DEBUG */		#endif /* CONFIG_SND_DEBUG */

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/control.c

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -225,8 +225,13 @@ struct snd_kcontrol snd_ctl_new1(const struct snd_kcontrol_new ncontrol,
	kctl.id.iface = ncontrol->iface;		kctl.id.iface = ncontrol->iface;
	kctl.id.device = ncontrol->device;		kctl.id.device = ncontrol->device;
	kctl.id.subdevice = ncontrol->subdevice;		kctl.id.subdevice = ncontrol->subdevice;
	if (ncontrol->name)		if (ncontrol->name) {
	strlcpy(kctl.id.name, ncontrol->name, sizeof(kctl.id.name));		strlcpy(kctl.id.name, ncontrol->name, sizeof(kctl.id.name));
			if (strcmp(ncontrol->name, kctl.id.name) != 0)
			snd_printk(KERN_WARNING
			"Control name '%s' truncated to '%s'\n",
			ncontrol->name, kctl.id.name);
			}
	kctl.id.index = ncontrol->index;		kctl.id.index = ncontrol->index;
	kctl.count = ncontrol->count ? ncontrol->count : 1;		kctl.count = ncontrol->count ? ncontrol->count : 1;
	access = ncontrol->access == 0 ? SNDRV_CTL_ELEM_ACCESS_READWRITE :		access = ncontrol->access == 0 ? SNDRV_CTL_ELEM_ACCESS_READWRITE :

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);