Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / drivers / extcon / extcon-class.c

diff --git a/drivers/extcon/extcon-class.c b/drivers/extcon/extcon-class.c
index a5a03ae069eed2c302c6434468c728a3265c346f..18ccadef43fdd80f81cff69501db3679c8e6b078 100644 (file)
--- a/drivers/extcon/extcon-class.c
+++ b/drivers/extcon/extcon-class.c
@@ -481,6 +481,7 @@ int extcon_register_interest(struct extcon_specific_cable_nb *obj,
                return -ENODEV;
        }
 }
+EXPORT_SYMBOL_GPL(extcon_register_interest);
 
 /**
  * extcon_unregister_interest() - Unregister the notifier registered by
@@ -495,6 +496,7 @@ int extcon_unregister_interest(struct extcon_specific_cable_nb *obj)
 
        return raw_notifier_chain_unregister(&obj->edev->nh, &obj->internal_nb);
 }
+EXPORT_SYMBOL_GPL(extcon_unregister_interest);
 
 /**
  * extcon_register_notifier() - Register a notifiee to get notified by
@@ -600,7 +602,7 @@ 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, edev->name ? edev->name : dev_name(dev));
+       dev_set_name(edev->dev, "%s", edev->name ? edev->name : dev_name(dev));
 
        if (edev->max_supported) {
                char buf[10];