mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-06 03:06:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-3.2' into for-3.3

Browse Source
This commit is contained in:
Mark Brown
2011-11-17 16:48:57 +00:00
parent 277c01bb45 2391a0e067
commit 4fbf4ad40f
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sound/soc/codecs/wm8753.c
View File

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

1
sound/soc/fsl/fsl_ssi.c
View File

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