diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-07-20 19:17:04 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-07-20 19:17:04 +0000 |
| commit | af4a69fcb7d06013da86453d8f2f206e048e537d (patch) | |
| tree | c2599e49cf44957e1e423f9efb5c9f9feed3134f /drivers/reset | |
| parent | f13f2bbe1cb5e8ceefee45db89365e7508ff0cc1 (diff) | |
| parent | 9afc0c209685bc239e45b6ca1ea07186b78c7437 (diff) | |
Merge tag 'v5.4.134' into 5.4-2.3.x-imx
This is the 5.4.134 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'drivers/reset')
| -rw-r--r-- | drivers/reset/core.c | 5 | ||||
| -rw-r--r-- | drivers/reset/reset-a10sr.c | 1 | ||||
| -rw-r--r-- | drivers/reset/reset-brcmstb.c | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/drivers/reset/core.c b/drivers/reset/core.c index 76c0dc7f165d..688b4f6227fc 100644 --- a/drivers/reset/core.c +++ b/drivers/reset/core.c @@ -565,7 +565,10 @@ static struct reset_control *__reset_control_get_internal( if (!rstc) return ERR_PTR(-ENOMEM); - try_module_get(rcdev->owner); + if (!try_module_get(rcdev->owner)) { + kfree(rstc); + return ERR_PTR(-ENODEV); + } rstc->rcdev = rcdev; list_add(&rstc->list, &rcdev->reset_control_head); diff --git a/drivers/reset/reset-a10sr.c b/drivers/reset/reset-a10sr.c index 7eacc89382f8..99b3bc8382f3 100644 --- a/drivers/reset/reset-a10sr.c +++ b/drivers/reset/reset-a10sr.c @@ -118,6 +118,7 @@ static struct platform_driver a10sr_reset_driver = { .probe = a10sr_reset_probe, .driver = { .name = "altr_a10sr_reset", + .of_match_table = a10sr_reset_of_match, }, }; module_platform_driver(a10sr_reset_driver); diff --git a/drivers/reset/reset-brcmstb.c b/drivers/reset/reset-brcmstb.c index f213264c8567..42c9d5241c53 100644 --- a/drivers/reset/reset-brcmstb.c +++ b/drivers/reset/reset-brcmstb.c @@ -111,6 +111,7 @@ static const struct of_device_id brcmstb_reset_of_match[] = { { .compatible = "brcm,brcmstb-reset" }, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, brcmstb_reset_of_match); static struct platform_driver brcmstb_reset_driver = { .probe = brcmstb_reset_probe, |