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

Commit 04172c0b authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/fix/asoc' into topic/asoc

parents 5b99e6cc 13d622b3

include/sound/soc.h

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ 
 */

#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \

	((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) \

	((unsigned long)&(struct soc_mixer_control) \

	{.reg = xreg, .max = xmax, .invert = xinvert})

sound/soc/fsl/mpc5200_psc_i2s.c

+8 −6
Original line number 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;

	u16 imr;

	u8 psc_cmd;

	long flags;

	unsigned long flags;



	if (substream->pstr->stream == SNDRV_PCM_STREAM_CAPTURE)

		s = &psc_i2s->capture;
@@ -699,9 +699,11 @@ static ssize_t psc_i2s_stat_store(struct device *dev, 
	return count;

}



DEVICE_ATTR(status, 0644, psc_i2s_status_show, NULL);

DEVICE_ATTR(playback_underrun, 0644, psc_i2s_stat_show, psc_i2s_stat_store);

DEVICE_ATTR(capture_overrun, 0644, psc_i2s_stat_show, psc_i2s_stat_store);

static DEVICE_ATTR(status, 0644, psc_i2s_status_show, NULL);

static DEVICE_ATTR(playback_underrun, 0644, psc_i2s_stat_show,

			psc_i2s_stat_store);

static DEVICE_ATTR(capture_overrun, 0644, psc_i2s_stat_show,

			psc_i2s_stat_store);



/* ---------------------------------------------------------------------

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


	/* Register the SYSFS files */

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

	rc |= device_create_file(psc_i2s->dev, &dev_attr_capture_overrun);

	rc |= device_create_file(psc_i2s->dev, &dev_attr_playback_underrun);

	if (rc)

		dev_info(psc_i2s->dev, "error creating sysfs files\n");

sound/soc/soc-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1555,7 +1555,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol, 
	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	int max = mc->max;

	unsigned int shift = mc->min;

	unsigned int shift = mc->shift;

	unsigned int rshift = mc->rshift;



	if (max == 1)

sound/soc/codecs/wm9713.c

+1 −1

File changed.

Contains only whitespace changes.