diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-17 16:48:57 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-17 16:48:57 +0000 |
| commit | 4fbf4ad40f5212f468940548d019bdfd92bcae46 (patch) | |
| tree | a5f6b237ab271154727e03b516fe5538d4769c1d | |
| parent | 277c01bb45a4924b1741fd41c353860e8d530f6f (diff) | |
| parent | 2391a0e06789a3f1718dee30b282562f7ed28c87 (diff) | |
| download | linux-4fbf4ad40f5212f468940548d019bdfd92bcae46.tar.bz2 | |
Merge branch 'for-3.2' into for-3.3
| -rw-r--r-- | sound/soc/codecs/wm8753.c | 3 | ||||
| -rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c index a9504710bb69..3a629d0d690e 100644 --- a/sound/soc/codecs/wm8753.c +++ b/sound/soc/codecs/wm8753.c @@ -190,6 +190,9 @@ static int wm8753_set_dai(struct snd_kcontrol *kcontrol, struct wm8753_priv *wm8753 = snd_soc_codec_get_drvdata(codec); u16 ioctl; + if (wm8753->dai_func == ucontrol->value.integer.value[0]) + return 0; + if (codec->active) return -EBUSY; diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 0268cf989736..83c4bd5b2dd7 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -694,6 +694,7 @@ static int __devinit fsl_ssi_probe(struct platform_device *pdev) /* Initialize the the device_attribute structure */ dev_attr = &ssi_private->dev_attr; + sysfs_attr_init(&dev_attr->attr); dev_attr->attr.name = "statistics"; dev_attr->attr.mode = S_IRUGO; dev_attr->show = fsl_sysfs_ssi_show; |