diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-24 16:24:21 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-24 16:24:21 +0300 |
| commit | 637d0957516eef3e861ca5889912c3234a9b593f (patch) | |
| tree | 8df51837d2ec9cba39e333acd94de5f685466d5e /drivers/bus | |
| parent | b2159182dd498fdb0f49e371ccc94efbc12d1f8e (diff) | |
| parent | e22ce8eb631bdc47a4a4ea7ecf4e4ba499db4f93 (diff) | |
| download | linux-637d0957516eef3e861ca5889912c3234a9b593f.tar.xz | |
Merge 5.14-rc7 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/ti-sysc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index 0ef98e3ba341..148a4dd8cb9a 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -3097,8 +3097,10 @@ static int sysc_probe(struct platform_device *pdev) return error; error = sysc_check_active_timer(ddata); - if (error == -EBUSY) + if (error == -ENXIO) ddata->reserved = true; + else if (error) + return error; error = sysc_get_clocks(ddata); if (error) |