diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2020-01-17 08:59:29 +0100 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2020-01-17 08:59:29 +0100 |
commit | 6a77de2596a8d02cbfe9cebe448d8575e4354c9a (patch) | |
tree | 13e7621c147ef1415195213089ce3c2c94590bde /fs/char_dev.c | |
parent | 59c324683400b41caa6d85b091e812ee3d5415c3 (diff) | |
parent | b3a987b0264d3ddbb24293ebff10eddfc472f653 (diff) | |
download | linux-6a77de2596a8d02cbfe9cebe448d8575e4354c9a.tar.bz2 |
Merge tag 'v5.5-rc6' into devel
Linux 5.5-rc6
Diffstat (limited to 'fs/char_dev.c')
-rw-r--r-- | fs/char_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c index 00dfe17871ac..c5e6eff5a381 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c @@ -352,7 +352,7 @@ static struct kobject *cdev_get(struct cdev *p) if (owner && !try_module_get(owner)) return NULL; - kobj = kobject_get(&p->kobj); + kobj = kobject_get_unless_zero(&p->kobj); if (!kobj) module_put(owner); return kobj; |