diff options
| author | Linus Torvalds | 2023-03-03 16:33:28 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2023-03-03 16:33:28 -0800 |
| commit | 0988a0ea791999ebbf95693f2676381825b05033 (patch) | |
| tree | 7994705407393098c97d93f8c585efe1ce9279bd /drivers | |
| parent | 3162745aad939af6b8bc00951d1344ee872526a9 (diff) | |
| parent | 13af134bdc6a9dacec4687e57b2ea8d3e08ff04f (diff) | |
Merge tag 'for-v6.3-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull more power supply updates from Sebastian Reichel:
- Fix DT binding for Richtek RT9467
- Fix a NULL pointer check in the power-supply core
- Document meaning of absent "present" property
* tag 'for-v6.3-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
dt-bindings: power: supply: Revise Richtek RT9467 compatible name
ABI: testing: sysfs-class-power: Document absence of "present" property
power: supply: fix null pointer check order in __power_supply_register
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/supply/power_supply_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index cc5b2e22b42a..f3d7c1da299f 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c @@ -1207,13 +1207,13 @@ __power_supply_register(struct device *parent, struct power_supply *psy; int rc; + if (!desc || !desc->name || !desc->properties || !desc->num_properties) + return ERR_PTR(-EINVAL); + if (!parent) pr_warn("%s: Expected proper parent device for '%s'\n", __func__, desc->name); - if (!desc || !desc->name || !desc->properties || !desc->num_properties) - return ERR_PTR(-EINVAL); - if (psy_has_property(desc, POWER_SUPPLY_PROP_USB_TYPE) && (!desc->usb_types || !desc->num_usb_types)) return ERR_PTR(-EINVAL); |