lkml.org 
[lkml]   [2017]   [Nov]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 17/56] adm80211: return an error if adm8211_alloc_rings() fails
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit c705a6b3aa7804d7bc6660183f51e510c61dc807 ]

    We accidentally return success when adm8211_alloc_rings() fails but we
    should preserve the error code.

    Fixes: cc0b88cf5ecf ("[PATCH] Add adm8211 802.11b wireless driver")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
    Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
    ---
    drivers/net/wireless/admtek/adm8211.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/wireless/admtek/adm8211.c b/drivers/net/wireless/admtek/adm8211.c
    index 70ecd82d674d..0321f85c388c 100644
    --- a/drivers/net/wireless/admtek/adm8211.c
    +++ b/drivers/net/wireless/admtek/adm8211.c
    @@ -1843,7 +1843,8 @@ static int adm8211_probe(struct pci_dev *pdev,
    priv->rx_ring_size = rx_ring_size;
    priv->tx_ring_size = tx_ring_size;

    - if (adm8211_alloc_rings(dev)) {
    + err = adm8211_alloc_rings(dev);
    + if (err) {
    printk(KERN_ERR "%s (adm8211): Cannot allocate TX/RX ring\n",
    pci_name(pdev));
    goto err_iounmap;
    --
    2.11.0
    \
     
     \ /
      Last update: 2017-11-15 04:11    [W:3.342 / U:0.544 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site