diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-12 21:50:48 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-01-12 21:50:48 +0000 |
| commit | a8a2b9ee4bec0b29d031324160b7f11af42a563a (patch) | |
| tree | baf164b7da460973b2ec916d6a3f7b39d5b76d9a /drivers/base | |
| parent | b598b85172f7df91090abe0f200f89a458ca4cc5 (diff) | |
| parent | a829146c3fdcf6d0b76d9c54556a223820f1f73b (diff) | |
Merge tag 'v5.4.89' into 5.4-2.3.x-imx
This is the 5.4.89 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 4837e7ac7b77..61beed439d6a 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -3456,7 +3456,7 @@ void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode) if (fwnode_is_primary(fn)) { dev->fwnode = fn->secondary; if (!(parent && fn == parent->fwnode)) - fn->secondary = ERR_PTR(-ENODEV); + fn->secondary = NULL; } else { dev->fwnode = NULL; } |