diff options
| author | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 07:21:50 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.z@gmail.com> | 2020-08-11 07:21:50 +0000 |
| commit | 6ae0a6e3c2e959d4b96c49e5d6aa475ed6932c43 (patch) | |
| tree | b35d197a144f4857ec29c2fd479721fd8d6677cb /drivers/base | |
| parent | 188eac302f18174c537f3142e103f75bcf9d8a6d (diff) | |
| parent | 4e9688ad3d36e8f73c73e435f53da5ae1cd91a70 (diff) | |
Merge tag 'v5.4.49' into 5.4-2.1.x-imx
This is the 5.4.49 stable release
Conflicts (manual resolve, NXP version taken):
sound/soc/fsl/fsl_esai.c
Commit 53057bd4ac84f upstream addresses the problem of endless isr in
case if exception interrupt is enabled and tasklet is scheduled. Since
NXP implementation has tasklet removed with commit 2bbe95fe6c0dd,
upstream fix does not match the main implementation, hence we keep the
NXP version here.
Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/platform.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 604a461848c9..0b67d41bab8f 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -802,6 +802,8 @@ int __init_or_module __platform_driver_probe(struct platform_driver *drv, /* temporary section violation during probe() */ drv->probe = probe; retval = code = __platform_driver_register(drv, module); + if (retval) + return retval; /* * Fixup that section violation, being paranoid about code scanning |