diff options
| author | Lucas Magasweran <lucas.magasweran@ieee.org> | 2018-05-08 04:43:33 -0700 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2018-05-21 07:51:59 -0700 |
| commit | 59df4f4e8e0b9a0abb14ad5128d36d844c3e2689 (patch) | |
| tree | b58746d6b637b1a1100dbe5e15006317dfb54bf1 | |
| parent | 2b2acdc889325bc1fa5700c5c68ac540ecf3b6ae (diff) | |
hwmon: (core) check parent dev != NULL when chip != NULL
hwmon_device_register_with_info() registration API requires a
non-NULL parent device when chip is non-NULL.
This commit adds a check and documents this requirement.
Signed-off-by: Lucas Magasweran <lucas.magasweran@ieee.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
| -rw-r--r-- | Documentation/hwmon/hwmon-kernel-api.txt | 3 | ||||
| -rw-r--r-- | drivers/hwmon/hwmon.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/hwmon/hwmon-kernel-api.txt b/Documentation/hwmon/hwmon-kernel-api.txt index 53a806696c64..eb7a78aebb38 100644 --- a/Documentation/hwmon/hwmon-kernel-api.txt +++ b/Documentation/hwmon/hwmon-kernel-api.txt @@ -71,7 +71,8 @@ hwmon_device_register_with_info is the most comprehensive and preferred means to register a hardware monitoring device. It creates the standard sysfs attributes in the hardware monitoring core, letting the driver focus on reading from and writing to the chip instead of having to bother with sysfs attributes. -Its parameters are described in more detail below. +The parent device parameter cannot be NULL with non-NULL chip info. Its +parameters are described in more detail below. devm_hwmon_device_register_with_info is similar to hwmon_device_register_with_info. However, it is device managed, meaning the diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index 32083e452cde..e88c01961948 100644 --- a/drivers/hwmon/hwmon.c +++ b/drivers/hwmon/hwmon.c @@ -698,6 +698,9 @@ hwmon_device_register_with_info(struct device *dev, const char *name, if (chip && (!chip->ops || !chip->ops->is_visible || !chip->info)) return ERR_PTR(-EINVAL); + if (chip && !dev) + return ERR_PTR(-EINVAL); + return __hwmon_device_register(dev, name, drvdata, chip, extra_groups); } EXPORT_SYMBOL_GPL(hwmon_device_register_with_info); |