| Message ID | 20200520120705.GH172354@mwanda (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 7dcef3988eedbfb40e7e95a821966a029a5a465b |
| Headers | show |
| Series | remoteproc: Fix an error code in devm_rproc_alloc() | expand |
Hi Dan, Le mer. 20 mai 2020 à 15:07, Dan Carpenter <dan.carpenter@oracle.com> a écrit : > The comments say that this function should return NULL on error and > the > caller expects NULL returns as well so I have modified the code to > match. > Returning an ERR_PTR(-ENOMEM) would lead to an OOps. > > Fixes: 305ac5a766b1 ("remoteproc: Add device-managed variants of > rproc_alloc/rproc_add") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Alright, makes sense. Reviewed-by: Paul Cercueil <paul@crapouillou.net> Cheers, -Paul > --- > drivers/remoteproc/remoteproc_core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/remoteproc/remoteproc_core.c > b/drivers/remoteproc/remoteproc_core.c > index 0cc015fabf78..9f04c30c4aaf 100644 > --- a/drivers/remoteproc/remoteproc_core.c > +++ b/drivers/remoteproc/remoteproc_core.c > @@ -2297,7 +2297,7 @@ struct rproc *devm_rproc_alloc(struct device > *dev, const char *name, > > ptr = devres_alloc(devm_rproc_free, sizeof(*ptr), GFP_KERNEL); > if (!ptr) > - return ERR_PTR(-ENOMEM); > + return NULL; > > rproc = rproc_alloc(dev, name, ops, firmware, len); > if (rproc) { > -- > 2.26.2 >
On Wed 20 May 05:07 PDT 2020, Dan Carpenter wrote: > The comments say that this function should return NULL on error and the > caller expects NULL returns as well so I have modified the code to match. > Returning an ERR_PTR(-ENOMEM) would lead to an OOps. > > Fixes: 305ac5a766b1 ("remoteproc: Add device-managed variants of rproc_alloc/rproc_add") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by and applied Thanks, Bjorn > --- > drivers/remoteproc/remoteproc_core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c > index 0cc015fabf78..9f04c30c4aaf 100644 > --- a/drivers/remoteproc/remoteproc_core.c > +++ b/drivers/remoteproc/remoteproc_core.c > @@ -2297,7 +2297,7 @@ struct rproc *devm_rproc_alloc(struct device *dev, const char *name, > > ptr = devres_alloc(devm_rproc_free, sizeof(*ptr), GFP_KERNEL); > if (!ptr) > - return ERR_PTR(-ENOMEM); > + return NULL; > > rproc = rproc_alloc(dev, name, ops, firmware, len); > if (rproc) { > -- > 2.26.2 >
Hello: This patch was applied to andersson/remoteproc.git (refs/heads/for-next). On Wed, 20 May 2020 15:07:05 +0300 you wrote: > The comments say that this function should return NULL on error and the > caller expects NULL returns as well so I have modified the code to match. > Returning an ERR_PTR(-ENOMEM) would lead to an OOps. > > Fixes: 305ac5a766b1 ("remoteproc: Add device-managed variants of rproc_alloc/rproc_add") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > [...] Here is a summary with links: - remoteproc: Fix an error code in devm_rproc_alloc() https://git.kernel.org/andersson/remoteproc/c/7dcef3988eedbfb40e7e95a821966a029a5a465b You are awesome, thank you!
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 0cc015fabf78..9f04c30c4aaf 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -2297,7 +2297,7 @@ struct rproc *devm_rproc_alloc(struct device *dev, const char *name, ptr = devres_alloc(devm_rproc_free, sizeof(*ptr), GFP_KERNEL); if (!ptr) - return ERR_PTR(-ENOMEM); + return NULL; rproc = rproc_alloc(dev, name, ops, firmware, len); if (rproc) {
The comments say that this function should return NULL on error and the caller expects NULL returns as well so I have modified the code to match. Returning an ERR_PTR(-ENOMEM) would lead to an OOps. Fixes: 305ac5a766b1 ("remoteproc: Add device-managed variants of rproc_alloc/rproc_add") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/remoteproc/remoteproc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)