lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 195/846] staging: rtl8192e: return error code from rtllib_softmac_init()
    Date
    From: Yang Yingliang <yangyingliang@huawei.com>

    [ Upstream commit 68bf78ff59a0891eb1239948e94ce10f73a9dd30 ]

    If it fails to allocate 'dot11d_info', rtllib_softmac_init()
    should return error code. And remove unneccessary error message.

    Fixes: 94a799425eee ("From: wlanfae <wlanfae@realtek.com>")
    Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
    Reviewed-by: Pavel Skripkin <paskripkin@gmail.com>
    Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
    Link: https://lore.kernel.org/r/20211202030704.2425621-2-yangyingliang@huawei.com
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/rtl8192e/rtllib.h | 2 +-
    drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++++--
    2 files changed, 5 insertions(+), 3 deletions(-)

    diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
    index c6f8b772335c1..c985e4ebc545a 100644
    --- a/drivers/staging/rtl8192e/rtllib.h
    +++ b/drivers/staging/rtl8192e/rtllib.h
    @@ -1980,7 +1980,7 @@ void SendDisassociation(struct rtllib_device *ieee, bool deauth, u16 asRsn);
    void rtllib_softmac_xmit(struct rtllib_txb *txb, struct rtllib_device *ieee);

    void rtllib_start_ibss(struct rtllib_device *ieee);
    -void rtllib_softmac_init(struct rtllib_device *ieee);
    +int rtllib_softmac_init(struct rtllib_device *ieee);
    void rtllib_softmac_free(struct rtllib_device *ieee);
    void rtllib_disassociate(struct rtllib_device *ieee);
    void rtllib_stop_scan(struct rtllib_device *ieee);
    diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
    index d2726d01c7573..503d33be71d99 100644
    --- a/drivers/staging/rtl8192e/rtllib_softmac.c
    +++ b/drivers/staging/rtl8192e/rtllib_softmac.c
    @@ -2952,7 +2952,7 @@ void rtllib_start_protocol(struct rtllib_device *ieee)
    }
    }

    -void rtllib_softmac_init(struct rtllib_device *ieee)
    +int rtllib_softmac_init(struct rtllib_device *ieee)
    {
    int i;

    @@ -2963,7 +2963,8 @@ void rtllib_softmac_init(struct rtllib_device *ieee)
    ieee->seq_ctrl[i] = 0;
    ieee->dot11d_info = kzalloc(sizeof(struct rt_dot11d_info), GFP_ATOMIC);
    if (!ieee->dot11d_info)
    - netdev_err(ieee->dev, "Can't alloc memory for DOT11D\n");
    + return -ENOMEM;
    +
    ieee->LinkDetectInfo.SlotIndex = 0;
    ieee->LinkDetectInfo.SlotNum = 2;
    ieee->LinkDetectInfo.NumRecvBcnInPeriod = 0;
    @@ -3029,6 +3030,7 @@ void rtllib_softmac_init(struct rtllib_device *ieee)

    tasklet_setup(&ieee->ps_task, rtllib_sta_ps);

    + return 0;
    }

    void rtllib_softmac_free(struct rtllib_device *ieee)
    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 22:09    [W:2.444 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site