Merge branch 'for-3.2' into for-3.3
This commit is contained in:
commit
4fbf4ad40f
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue