diff options
author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-11-05 23:46:06 +0100 |
---|---|---|
committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-11-05 23:46:06 +0100 |
commit | a41984e726601b2f6cf61e3128aba84f7a85436c (patch) | |
tree | 6d1156eb0d5779bda12592eca6f2c9ca93722a09 /libdde-linux26/contrib/drivers/base | |
parent | 573055eb4f44e819f983f083c52716bdec8edf14 (diff) |
sync with upstream packaging
Diffstat (limited to 'libdde-linux26/contrib/drivers/base')
-rw-r--r-- | libdde-linux26/contrib/drivers/base/attribute_container.c | 2 | ||||
-rw-r--r-- | libdde-linux26/contrib/drivers/base/platform.c | 2 | ||||
-rw-r--r-- | libdde-linux26/contrib/drivers/base/sys.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libdde-linux26/contrib/drivers/base/attribute_container.c b/libdde-linux26/contrib/drivers/base/attribute_container.c index b9cda053..e0f7859f 100644 --- a/libdde-linux26/contrib/drivers/base/attribute_container.c +++ b/libdde-linux26/contrib/drivers/base/attribute_container.c @@ -167,7 +167,7 @@ attribute_container_add_device(struct device *dev, ic->classdev.parent = get_device(dev); ic->classdev.class = cont->class; cont->class->dev_release = attribute_container_release; - dev_set_name(&ic->classdev, dev_name(dev)); + dev_set_name(&ic->classdev, "%s", dev_name(dev)); if (fn) fn(cont, dev, &ic->classdev); else diff --git a/libdde-linux26/contrib/drivers/base/platform.c b/libdde-linux26/contrib/drivers/base/platform.c index 349a1013..030d638c 100644 --- a/libdde-linux26/contrib/drivers/base/platform.c +++ b/libdde-linux26/contrib/drivers/base/platform.c @@ -244,7 +244,7 @@ int platform_device_add(struct platform_device *pdev) if (pdev->id != -1) dev_set_name(&pdev->dev, "%s.%d", pdev->name, pdev->id); else - dev_set_name(&pdev->dev, pdev->name); + dev_set_name(&pdev->dev, "%s", pdev->name); for (i = 0; i < pdev->num_resources; i++) { struct resource *p, *r = &pdev->resource[i]; diff --git a/libdde-linux26/contrib/drivers/base/sys.c b/libdde-linux26/contrib/drivers/base/sys.c index b428c8c4..38e725c1 100644 --- a/libdde-linux26/contrib/drivers/base/sys.c +++ b/libdde-linux26/contrib/drivers/base/sys.c @@ -137,7 +137,7 @@ int sysdev_class_register(struct sysdev_class * cls) cls->kset.kobj.parent = &system_kset->kobj; cls->kset.kobj.ktype = &ktype_sysdev_class; cls->kset.kobj.kset = system_kset; - kobject_set_name(&cls->kset.kobj, cls->name); + kobject_set_name(&cls->kset.kobj, "%s", cls->name); return kset_register(&cls->kset); } |