adm80211: return an error if adm8211_alloc_rings() fails
authorDan Carpenter <dan.carpenter@oracle.com>
Wed, 7 Dec 2016 11:21:22 +0000 (14:21 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Nov 2017 08:39:12 +0000 (08:39 +0000)
[ 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/wireless/admtek/adm8211.c

index 70ecd82d674dcee50aef2cbf64b321959f09544a..0321f85c388c2b0eea2ac3f21c591d5729959a00 100644 (file)
@@ -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;