diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-14 17:56:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-14 17:56:33 +0000 |
| commit | 11a266d2e5e6b73bfba337fb3ef21c8fd4fa4150 (patch) | |
| tree | 3c4ca0079cb67feeaa6a678212ca6f4313cf5a69 /drivers/base | |
| parent | 5bca889af9ee712d0dac3b61b1cec79e7c99ec58 (diff) | |
| parent | 9c3da88145da7cd96bb898bc0304d3f783d4c8b2 (diff) | |
Merge tag 'v3.14.24' into linux-linaro-lsk-v3.14
This is the 3.14.24 stable release
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 2b567177ef78..6a8955e78610 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -741,12 +741,12 @@ class_dir_create_and_add(struct class *class, struct kobject *parent_kobj) return &dir->kobj; } +static DEFINE_MUTEX(gdp_mutex); static struct kobject *get_device_parent(struct device *dev, struct device *parent) { if (dev->class) { - static DEFINE_MUTEX(gdp_mutex); struct kobject *kobj = NULL; struct kobject *parent_kobj; struct kobject *k; @@ -810,7 +810,9 @@ static void cleanup_glue_dir(struct device *dev, struct kobject *glue_dir) glue_dir->kset != &dev->class->p->glue_dirs) return; + mutex_lock(&gdp_mutex); kobject_put(glue_dir); + mutex_unlock(&gdp_mutex); } static void cleanup_device_parent(struct device *dev) |