summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-05-06 13:15:52 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-05-06 13:15:52 +0200
commit7c21b38ca937603741d1ec00a944eeb578cb653f (patch)
tree741ca45f3d505adcce83035ccdf046b5359f5e54 /drivers/base
parent93d68841a23a5779cef6fb9aa0ef32e7c5bd00da (diff)
parent0224a4a30b57385a60065aa598181868881d8fc6 (diff)
downloadop-kernel-dev-7c21b38ca937603741d1ec00a944eeb578cb653f.zip
op-kernel-dev-7c21b38ca937603741d1ec00a944eeb578cb653f.tar.gz
Merge branches 'acpica-fixes' and 'device-properties-fixes'
* acpica-fixes: ACPICA: Dispatcher: Update thread ID for recursive method calls * device-properties-fixes: device property: Avoid potential dereferences of invalid pointers
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/property.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/property.c b/drivers/base/property.c
index 9b1a65d..7f692ac 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -21,7 +21,7 @@
static inline bool is_pset_node(struct fwnode_handle *fwnode)
{
- return fwnode && fwnode->type == FWNODE_PDATA;
+ return !IS_ERR_OR_NULL(fwnode) && fwnode->type == FWNODE_PDATA;
}
static inline struct property_set *to_pset_node(struct fwnode_handle *fwnode)
OpenPOWER on IntegriCloud