2018-11-24 08:04:38

by Dan Carpenter

Subject: [PATCH 1/2] i3c: fix an error code in i3c_master_add_i3c_dev_locked()

We should return "ret" as-is. The "newdev" variable is a valid pointer.

Fixes: 3a379bbcea0a ("i3c: Add core I3C infrastructure")
Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/i3c/master.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
index 0ea7bb045fad..bda4b9613e53 100644
--- a/drivers/i3c/master.c
+++ b/drivers/i3c/master.c
@@ -1823,10 +1823,8 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master,
return PTR_ERR(newdev);

ret = i3c_master_attach_i3c_dev(master, newdev);
- if (ret) {
- ret = PTR_ERR(newdev);
+ if (ret)
goto err_free_dev;
- }

ret = i3c_master_retrieve_dev_info(newdev);
if (ret)
--
2.11.0

2018-11-26 08:47:53

by Boris Brezillon

Subject: Re: [PATCH 1/2] i3c: fix an error code in i3c_master_add_i3c_dev_locked()

On Fri, 23 Nov 2018 10:14:42 +0300
Dan Carpenter <[email protected]> wrote:

> We should return "ret" as-is. The "newdev" variable is a valid pointer.
>
> Fixes: 3a379bbcea0a ("i3c: Add core I3C infrastructure")
> Signed-off-by: Dan Carpenter <[email protected]>

Queued to i3c/next.

Thanks,

Boris

> ---
> drivers/i3c/master.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/i3c/master.c b/drivers/i3c/master.c
> index 0ea7bb045fad..bda4b9613e53 100644
> --- a/drivers/i3c/master.c
> +++ b/drivers/i3c/master.c
> @@ -1823,10 +1823,8 @@ int i3c_master_add_i3c_dev_locked(struct i3c_master_controller *master,
> return PTR_ERR(newdev);
>
> ret = i3c_master_attach_i3c_dev(master, newdev);
> - if (ret) {
> - ret = PTR_ERR(newdev);
> + if (ret)
> goto err_free_dev;
> - }
>
> ret = i3c_master_retrieve_dev_info(newdev);
> if (ret)