|
@@ -119,7 +119,7 @@ enclosure_register(struct device *dev, const char *name, int components,
|
|
|
edev->edev.class = &enclosure_class;
|
|
|
edev->edev.parent = get_device(dev);
|
|
|
edev->cb = cb;
|
|
|
- dev_set_name(&edev->edev, name);
|
|
|
+ dev_set_name(&edev->edev, "%s", name);
|
|
|
err = device_register(&edev->edev);
|
|
|
if (err)
|
|
|
goto err;
|
|
@@ -255,8 +255,8 @@ enclosure_component_register(struct enclosure_device *edev,
|
|
|
ecomp->number = number;
|
|
|
cdev = &ecomp->cdev;
|
|
|
cdev->parent = get_device(&edev->edev);
|
|
|
- if (name)
|
|
|
- dev_set_name(cdev, name);
|
|
|
+ if (name && name[0])
|
|
|
+ dev_set_name(cdev, "%s", name);
|
|
|
else
|
|
|
dev_set_name(cdev, "%u", number);
|
|
|
|