diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-06 13:15:52 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-05-06 13:15:52 +0200 |
| commit | 7c21b38ca937603741d1ec00a944eeb578cb653f (patch) | |
| tree | 741ca45f3d505adcce83035ccdf046b5359f5e54 /drivers/base | |
| parent | 93d68841a23a5779cef6fb9aa0ef32e7c5bd00da (diff) | |
| parent | 0224a4a30b57385a60065aa598181868881d8fc6 (diff) | |
| download | linux-stable-7c21b38ca937603741d1ec00a944eeb578cb653f.tar.gz linux-stable-7c21b38ca937603741d1ec00a944eeb578cb653f.tar.bz2 linux-stable-7c21b38ca937603741d1ec00a944eeb578cb653f.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/property.c b/drivers/base/property.c index 9b1a65debd49..7f692accdc90 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) |