diff --git a/[refs] b/[refs] index 142fe408f7b1..ddb8ca3804b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c25cd1543986e7c16c7ddf738748ccd530a18268 +refs/heads/master: cc22d37e7f5e1745658760660f03793913f43e49 diff --git a/trunk/include/sound/soc.h b/trunk/include/sound/soc.h index 82bd773f8ab1..2ebf7877c148 100644 --- a/trunk/include/sound/soc.h +++ b/trunk/include/sound/soc.h @@ -718,6 +718,7 @@ struct snd_soc_platform { int id; struct device *dev; struct snd_soc_platform_driver *driver; + struct mutex mutex; unsigned int suspended:1; /* platform is suspended */ unsigned int probed:1; diff --git a/trunk/sound/soc/soc-core.c b/trunk/sound/soc/soc-core.c index 7978f6c01ef7..c90bb0110bd2 100644 --- a/trunk/sound/soc/soc-core.c +++ b/trunk/sound/soc/soc-core.c @@ -3382,6 +3382,7 @@ int snd_soc_register_platform(struct device *dev, platform->dapm.dev = dev; platform->dapm.platform = platform; platform->dapm.stream_event = platform_drv->stream_event; + mutex_init(&platform->mutex); mutex_lock(&client_mutex); list_add(&platform->list, &platform_list);