Merge branches 'topic/fix/misc' and 'topic/fix/asoc' into for-linus (71c21b4c) · Commits · e / devices / android_kernel_fairphone_FP3

include/sound/soc.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,8 @@
	*/		*/
	#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \		#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \
	((unsigned long)&(struct soc_mixer_control) \		((unsigned long)&(struct soc_mixer_control) \
	{.reg = xreg, .shift = xshift, .max = xmax, .invert = xinvert})		{.reg = xreg, .shift = xshift, .rshift = xshift, .max = xmax, \
			.invert = xinvert})
	#define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \		#define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \
	((unsigned long)&(struct soc_mixer_control) \		((unsigned long)&(struct soc_mixer_control) \
	{.reg = xreg, .max = xmax, .invert = xinvert})		{.reg = xreg, .max = xmax, .invert = xinvert})

sound/pci/ac97/ac97_codec.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1927,7 +1927,7 @@ static int snd_ac97_dev_register(struct snd_device *device)
	ac97->dev.bus = &ac97_bus_type;		ac97->dev.bus = &ac97_bus_type;
	ac97->dev.parent = ac97->bus->card->dev;		ac97->dev.parent = ac97->bus->card->dev;
	ac97->dev.release = ac97_device_release;		ac97->dev.release = ac97_device_release;
	snprintf(ac97->dev.bus_id, BUS_ID_SIZE, "%d-%d:%s",		dev_set_name(&ac97->dev, "%d-%d:%s",
	ac97->bus->card->number, ac97->num,		ac97->bus->card->number, ac97->num,
	snd_ac97_get_short_name(ac97));		snd_ac97_get_short_name(ac97));
	if ((err = device_register(&ac97->dev)) < 0) {		if ((err = device_register(&ac97->dev)) < 0) {

sound/pci/ice1712/ice1712.c

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2688,12 +2688,13 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
	return err;		return err;
	}		}

	if (ice_has_con_ac97(ice))		if (ice_has_con_ac97(ice)) {
	err = snd_ice1712_pcm(ice, pcm_dev++, NULL);		err = snd_ice1712_pcm(ice, pcm_dev++, NULL);
	if (err < 0) {		if (err < 0) {
	snd_card_free(card);		snd_card_free(card);
	return err;		return err;
	}		}
			}

	err = snd_ice1712_ac97_mixer(ice);		err = snd_ice1712_ac97_mixer(ice);
	if (err < 0) {		if (err < 0) {
	@@ -2715,12 +2716,13 @@ static int __devinit snd_ice1712_probe(struct pci_dev *pci,
	}		}
	}		}

	if (ice_has_con_ac97(ice))		if (ice_has_con_ac97(ice)) {
	err = snd_ice1712_pcm_ds(ice, pcm_dev++, NULL);		err = snd_ice1712_pcm_ds(ice, pcm_dev++, NULL);
	if (err < 0) {		if (err < 0) {
	snd_card_free(card);		snd_card_free(card);
	return err;		return err;
	}		}
			}

	if (!c->no_mpu401) {		if (!c->no_mpu401) {
	err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712,		err = snd_mpu401_uart_new(card, 0, MPU401_HW_ICE1712,

sound/soc/fsl/mpc5200_psc_i2s.c

+8 −6

Original line number	Original line	Diff line number	Diff line
	@@ -277,7 +277,7 @@ static int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd)
	struct mpc52xx_psc __iomem *regs = psc_i2s->psc_regs;		struct mpc52xx_psc __iomem *regs = psc_i2s->psc_regs;
	u16 imr;		u16 imr;
	u8 psc_cmd;		u8 psc_cmd;
	long flags;		unsigned long flags;

	if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)		if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)
	s = &psc_i2s->capture;		s = &psc_i2s->capture;
	@@ -699,9 +699,11 @@ static ssize_t psc_i2s_stat_store(struct device *dev,
	return count;		return count;
	}		}

	DEVICE_ATTR(status, 0644, psc_i2s_status_show, NULL);		static DEVICE_ATTR(status, 0644, psc_i2s_status_show, NULL);
	DEVICE_ATTR(playback_underrun, 0644, psc_i2s_stat_show, psc_i2s_stat_store);		static DEVICE_ATTR(playback_underrun, 0644, psc_i2s_stat_show,
	DEVICE_ATTR(capture_overrun, 0644, psc_i2s_stat_show, psc_i2s_stat_store);		psc_i2s_stat_store);
			static DEVICE_ATTR(capture_overrun, 0644, psc_i2s_stat_show,
			psc_i2s_stat_store);

	/* ---------------------------------------------------------------------		/* ---------------------------------------------------------------------
	* OF platform bus binding code:		* OF platform bus binding code:
	@@ -819,8 +821,8 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,

	/* Register the SYSFS files */		/* Register the SYSFS files */
	rc = device_create_file(psc_i2s->dev, &dev_attr_status);		rc = device_create_file(psc_i2s->dev, &dev_attr_status);
	rc = device_create_file(psc_i2s->dev, &dev_attr_capture_overrun);		rc \|= device_create_file(psc_i2s->dev, &dev_attr_capture_overrun);
	rc = device_create_file(psc_i2s->dev, &dev_attr_playback_underrun);		rc \|= device_create_file(psc_i2s->dev, &dev_attr_playback_underrun);
	if (rc)		if (rc)
	dev_info(psc_i2s->dev, "error creating sysfs files\n");		dev_info(psc_i2s->dev, "error creating sysfs files\n");

sound/soc/soc-core.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1462,7 +1462,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,
	struct soc_mixer_control *mc =		struct soc_mixer_control *mc =
	(struct soc_mixer_control *)kcontrol->private_value;		(struct soc_mixer_control *)kcontrol->private_value;
	int max = mc->max;		int max = mc->max;
	unsigned int shift = mc->min;		unsigned int shift = mc->shift;
	unsigned int rshift = mc->rshift;		unsigned int rshift = mc->rshift;

	if (max == 1)		if (max == 1)