diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-05-25 15:10:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-05-25 15:10:37 +0200 |
| commit | a5d8e55b2c7d3d18d7837af0ef8d1477eeeb919c (patch) | |
| tree | fe07d3af2f6f13d005da832fe3d18d5d257fb9bd /drivers/net/can/sun4i_can.c | |
| parent | 4da0b2b7e67524cc206067865666899bc02e1cb0 (diff) | |
| parent | 9cb1fd0efd195590b828b9b865421ad345a4a145 (diff) | |
Merge tag 'v5.7-rc7' into efi/core, to refresh the branch and pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/can/sun4i_can.c')
| -rw-r--r-- | drivers/net/can/sun4i_can.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c index e3ba8ab0cbf4..e2c6cf4b2228 100644 --- a/drivers/net/can/sun4i_can.c +++ b/drivers/net/can/sun4i_can.c @@ -792,7 +792,7 @@ static int sun4ican_probe(struct platform_device *pdev) addr = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(addr)) { - err = -EBUSY; + err = PTR_ERR(addr); goto exit; } |