Commit 4fbf4ad4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-3.2' into for-3.3

parents 277c01bb 2391a0e0

sound/soc/codecs/wm8753.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -190,6 +190,9 @@ static int wm8753_set_dai(struct snd_kcontrol *kcontrol, 
	struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);

	struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec);

	u16 ioctl;

	u16 ioctl;





	if (wm8753->dai_func == ucontrol->value.integer.value[0])

		return 0;



	if (codec->active)

	if (codec->active)

		return -EBUSY;

		return -EBUSY;

sound/soc/fsl/fsl_ssi.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -694,6 +694,7 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev) 




	/* Initialize the the device_attribute structure */

	/* Initialize the the device_attribute structure */

	dev_attr = &ssi_private->dev_attr;

	dev_attr = &ssi_private->dev_attr;

	sysfs_attr_init(&dev_attr->attr);

	dev_attr->attr.name = "statistics";

	dev_attr->attr.name = "statistics";

	dev_attr->attr.mode = S_IRUGO;

	dev_attr->attr.mode = S_IRUGO;

	dev_attr->show = fsl_sysfs_ssi_show;

	dev_attr->show = fsl_sysfs_ssi_show;

CRA Git | Maintained and supported by SUSTech CRA and CCSE