Skip to contentSkip to conversation

adm80211: return an error if adm8211_alloc_rings() fails

PATCH In review Dan Carpenter 2 participants 2 messages Dec 7, 2016 – Dec 30, 2016

Subsystems (3)
Kernel janitors Networking drivers (wireless) ADM8211 wireless driver
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 adm80211: return an error if adm8211_alloc_rings() fails

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 <[email protected]>
drivers/net/wireless/admtek/adm8211.c +2 -1
index 2b4a3eb38dfa..098c814e22c8 100644
@@ -1863,7 +1863,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;
#1 lore raw
Quoted 11 lines · Dan Carpenter

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 <[email protected]>
drivers/net/wireless/admtek/adm8211.c +0 -0
index 2b4a3eb38dfa..098c814e22c8 100644

drivers/net/wireless/admtek/adm8211.c static int adm8211_probe(struct pci_dev *pdev, · line 1870

Quoted 9 lines
drivers/net/wireless/admtek/adm8211.c +2 -1
@@ -1863,7 +1863,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;

Patch applied to wireless-drivers-next.git, thanks.

c705a6b3aa78 adm80211: return an error if adm8211_alloc_rings() fails

Signature · 6 lines
https://patchwork.kernel.org/patch/9464449/

Documentation about submitting wireless patches and checking status
from patchwork:

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches