Update extcon for v5.12-rc4

Detailed update of this pull request as following:
 1. Add stubs of extcon_register_notifier_all() function for when
 CONFIG_EXTCON is disabled.
 
 2. Fix exception handling in extcon_dev_register() when failed to
 initialize the extcon device.
 -----BEGIN PGP SIGNATURE-----
 
 iQJKBAABCgA0FiEEsSpuqBtbWtRe4rLGnM3fLN7rz1MFAmBOxjgWHGN3MDAuY2hv
 aUBzYW1zdW5nLmNvbQAKCRCczd8s3uvPU+RyEAC+2A58Zp6bdK1UvX2e9Cj15W8/
 JFBt+alk0X+VreDLFAe9fFyV21M4e3hCb2b1983hxUnWBrl7wDoNsI/31IxxopuO
 CjG3U7DIkYZq0P6i65zNARlmuRkGGItl+bWvz3W0oYSbWkkE6xLL5F+u7eRyjWrJ
 ZJHIRwqlvaR+P/f/axRXA129BMG/xUt09PIe+Y4N6R02OJZOxu3vkUNOeGDDzk2s
 NLsXlKJ5taYplLem7V2XyZNLPZ6G3Pi4qOcVGbdHmFZMPsOQ8YXgdxFGnx4V/hLy
 dnk8b+d3cFoOSH3ljv7ix0oAvHnZVmPQGxnWI9cMNBL/z9GpAWxSiaycjS7Ikj/Y
 85xjcRBpdcwoAIXgVDjZFYkSA01shecPcZ6LbBB2Xt6/kKcsEKPmA/sw5Ej3VL8r
 nsq0Nn+5tmYiWAukuND8cEQeDUOYc+X+8qDwZqc6GgWp20zkplo9xvjDy8LmK8lC
 3VeuAc+PgNB7wfYFWKiBAafx06+zQ7cTSchFqzFrM05AEpmtLwzktxYYlXB5dy1q
 RlyDgINIC2zXBuPJq+HkxsQjOz8qn4i3HzQ4LoNnfce/uHWgiYcrgDDv264ATQKa
 AMuryavqyuXJpfN5g6JIFQDrhkWMSLFd+Kblu9ARrsUl+/VlWY0tSBIPA4g0lnMs
 52/wariOz8fpP+AiEA==
 =1HoF
 -----END PGP SIGNATURE-----

Merge tag 'extcon-fixes-for-5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next

Chanwoo writes:

Update extcon for v5.12-rc4

Detailed update of this pull request as following:
1. Add stubs of extcon_register_notifier_all() function for when
CONFIG_EXTCON is disabled.

2. Fix exception handling in extcon_dev_register() when failed to
initialize the extcon device.

* tag 'extcon-fixes-for-5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon:
  extcon: Fix error handling in extcon_dev_register
  extcon: Add stubs for extcon_register_notifier_all() functions
This commit is contained in:
Greg Kroah-Hartman 2021-03-15 09:36:55 +01:00
commit e01b7d04a6
2 changed files with 24 additions and 0 deletions

View File

@ -1241,6 +1241,7 @@ int extcon_dev_register(struct extcon_dev *edev)
sizeof(*edev->nh), GFP_KERNEL);
if (!edev->nh) {
ret = -ENOMEM;
device_unregister(&edev->dev);
goto err_dev;
}

View File

@ -271,6 +271,29 @@ static inline void devm_extcon_unregister_notifier(struct device *dev,
struct extcon_dev *edev, unsigned int id,
struct notifier_block *nb) { }
static inline int extcon_register_notifier_all(struct extcon_dev *edev,
struct notifier_block *nb)
{
return 0;
}
static inline int extcon_unregister_notifier_all(struct extcon_dev *edev,
struct notifier_block *nb)
{
return 0;
}
static inline int devm_extcon_register_notifier_all(struct device *dev,
struct extcon_dev *edev,
struct notifier_block *nb)
{
return 0;
}
static inline void devm_extcon_unregister_notifier_all(struct device *dev,
struct extcon_dev *edev,
struct notifier_block *nb) { }
static inline struct extcon_dev *extcon_get_extcon_dev(const char *extcon_name)
{
return ERR_PTR(-ENODEV);