lkml.org 
[lkml]   [2018]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 055/173] wan/fsl_ucc_hdlc: use IS_ERR_VALUE() to check return value of qe_muram_alloc
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: YueHaibing <yuehaibing@huawei.com>

    [ Upstream commit fd800f646402c0f85547166b59ca065175928b7b ]

    qe_muram_alloc return a unsigned long integer,which should not
    compared with zero. check it using IS_ERR_VALUE() to fix this.

    Fixes: c19b6d246a35 ("drivers/net: support hdlc function for QE-UCC")
    Signed-off-by: YueHaibing <yuehaibing@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/wan/fsl_ucc_hdlc.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/net/wan/fsl_ucc_hdlc.c
    +++ b/drivers/net/wan/fsl_ucc_hdlc.c
    @@ -192,7 +192,7 @@ static int uhdlc_init(struct ucc_hdlc_pr
    priv->ucc_pram_offset = qe_muram_alloc(sizeof(struct ucc_hdlc_param),
    ALIGNMENT_OF_UCC_HDLC_PRAM);

    - if (priv->ucc_pram_offset < 0) {
    + if (IS_ERR_VALUE(priv->ucc_pram_offset)) {
    dev_err(priv->dev, "Can not allocate MURAM for hdlc parameter.\n");
    ret = -ENOMEM;
    goto free_tx_bd;
    @@ -228,14 +228,14 @@ static int uhdlc_init(struct ucc_hdlc_pr

    /* Alloc riptr, tiptr */
    riptr = qe_muram_alloc(32, 32);
    - if (riptr < 0) {
    + if (IS_ERR_VALUE(riptr)) {
    dev_err(priv->dev, "Cannot allocate MURAM mem for Receive internal temp data pointer\n");
    ret = -ENOMEM;
    goto free_tx_skbuff;
    }

    tiptr = qe_muram_alloc(32, 32);
    - if (tiptr < 0) {
    + if (IS_ERR_VALUE(tiptr)) {
    dev_err(priv->dev, "Cannot allocate MURAM mem for Transmit internal temp data pointer\n");
    ret = -ENOMEM;
    goto free_riptr;

    \
     
     \ /
      Last update: 2018-09-24 14:55    [W:2.113 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site