| Message ID | 1450783219-23605-1-git-send-email-pratiyush.srivastava@freescale.com |
|---|---|
| State | Accepted |
| Commit | c088326597cad019618a98f6fc65bc1dd92eb301 |
| Delegated to: | York Sun |
| Headers | show |
> -----Original Message----- > From: Pratiyush Srivastava > Sent: Tuesday, December 22, 2015 4:50 PM > To: u-boot@lists.denx.de > Cc: Yusong Sun <yorksun@freescale.com>; Prabhakar Kushwaha > <prabhakar@freescale.com>; Pratiyush Srivastava > <pratiyush.srivastava@freescale.com> > Subject: [PATCH] drivers: net: fsl_mc: Compare pointer value > qbman_swp_mc_start > > Current code compares the return pointer of function > qbman_cena_write_start with NULL. Instead the value of the return pointer > should be compared. > Signed-off-by: Pratiyush Mohan Srivastava > <pratiyush.srivastava@freescale.com> > --- > drivers/net/fsl-mc/dpio/qbman_portal.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl- > mc/dpio/qbman_portal.c > index 449ff8a..4b64c8a 100644 > --- a/drivers/net/fsl-mc/dpio/qbman_portal.c > +++ b/drivers/net/fsl-mc/dpio/qbman_portal.c > @@ -102,12 +102,14 @@ struct qbman_swp *qbman_swp_init(const struct > qbman_swp_desc *d) void *qbman_swp_mc_start(struct qbman_swp *p) > { > void *ret; > + int *return_val; > #ifdef QBMAN_CHECKING > BUG_ON(p->mc.check != swp_mc_can_start); #endif > ret = qbman_cena_write_start(&p->sys, QBMAN_CENA_SWP_CR); > #ifdef QBMAN_CHECKING > - if (!ret) > + return_val = (int *)ret; > + if (!(*return_val)) > p->mc.check = swp_mc_can_submit; > #endif > return ret; > -- Acked-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com> --prabhakar
On 12/22/2015 03:19 AM, Pratiyush Srivastava wrote: > Current code compares the return pointer of function qbman_cena_write_start > with NULL. Instead the value of the return pointer should be compared. > Signed-off-by: Pratiyush Mohan Srivastava <pratiyush.srivastava@freescale.com> > --- > drivers/net/fsl-mc/dpio/qbman_portal.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) Applied to u-boot-fsl-qoriq master. Awaiting upstream. Thanks. York
diff --git a/drivers/net/fsl-mc/dpio/qbman_portal.c b/drivers/net/fsl-mc/dpio/qbman_portal.c index 449ff8a..4b64c8a 100644 --- a/drivers/net/fsl-mc/dpio/qbman_portal.c +++ b/drivers/net/fsl-mc/dpio/qbman_portal.c @@ -102,12 +102,14 @@ struct qbman_swp *qbman_swp_init(const struct qbman_swp_desc *d) void *qbman_swp_mc_start(struct qbman_swp *p) { void *ret; + int *return_val; #ifdef QBMAN_CHECKING BUG_ON(p->mc.check != swp_mc_can_start); #endif ret = qbman_cena_write_start(&p->sys, QBMAN_CENA_SWP_CR); #ifdef QBMAN_CHECKING - if (!ret) + return_val = (int *)ret; + if (!(*return_val)) p->mc.check = swp_mc_can_submit; #endif return ret;
Current code compares the return pointer of function qbman_cena_write_start with NULL. Instead the value of the return pointer should be compared. Signed-off-by: Pratiyush Mohan Srivastava <pratiyush.srivastava@freescale.com> --- drivers/net/fsl-mc/dpio/qbman_portal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)