Merge tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / extcon / extcon-class.c

diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c
index 022ca369834a89bbab877d60c2d5ba2f66340deb..148382faded9f125940ee11ca211bcea38f36290 100644 (file)
--- a/drivers/extcon/extcon-class.c
+++ b/drivers/extcon/extcon-class.c
@@ -605,7 +605,8 @@ int extcon_dev_register(struct extcon_dev *edev, struct device *dev)
        edev->dev->class = extcon_class;
        edev->dev->release = extcon_dev_release;
 
-       dev_set_name(edev->dev, "%s", edev->name ? edev->name : dev_name(dev));
+       edev->name = edev->name ? edev->name : dev_name(dev);
+       dev_set_name(edev->dev, "%s", edev->name);
 
        if (edev->max_supported) {
                char buf[10];