diff options
| author |   Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2015-08-10 19:56:46 +0300 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-08-26 01:46:39 +0200 |
| commit | 4bf011815f2e093c7f60004f4f5683cf40b905b9 (patch) | |
| tree | 5195f134c30f92f343baa053c533d4a2429b99bb /include/linux/of.h | |
| parent | device property: attach 'else if' to the proper 'if' (diff) | |
| download | linux-dev-4bf011815f2e093c7f60004f4f5683cf40b905b9.tar.xz linux-dev-4bf011815f2e093c7f60004f4f5683cf40b905b9.zip | |
device property: check fwnode type in to_of_node()
Potentially one of platform can support both ACPI and OF. In that case when we
call to_of_node() for non-OF fwnode types we will get non-NULL result, which is
wrong. Check for the type and return a correspondent result.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/linux/of.h')
| -rw-r--r-- | include/linux/of.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/of.h b/include/linux/of.h index edc068d19c79..2194b8ca41f9 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -136,7 +136,8 @@ static inline bool is_of_node(struct fwnode_handle *fwnode) static inline struct device_node *to_of_node(struct fwnode_handle *fwnode) { - return fwnode ? container_of(fwnode, struct device_node, fwnode) : NULL; + return is_of_node(fwnode) ? + container_of(fwnode, struct device_node, fwnode) : NULL; } static inline bool of_have_populated_dt(void) |