diff mbox series

ath9k: fix an IS_ERR() vs NULL check

Message ID 20211011123533.GA15188@kili (mailing list archive)
State Accepted
Commit 57671351379b2051cfb07fc14e0bead9916a0880
Delegated to: Kalle Valo
Headers show
Series ath9k: fix an IS_ERR() vs NULL check | expand

Commit Message

Dan Carpenter Oct. 11, 2021, 12:35 p.m. UTC 
The devm_kmemdup() function doesn't return error pointers, it returns
NULL on error.

Fixes: eb3a97a69be8 ("ath9k: fetch calibration data via nvmem subsystem")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/net/wireless/ath/ath9k/init.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Kalle Valo Oct. 13, 2021, 5:48 a.m. UTC | #1 
Dan Carpenter <dan.carpenter@oracle.com> wrote:

> The devm_kmemdup() function doesn't return error pointers, it returns
> NULL on error.
> 
> Fixes: eb3a97a69be8 ("ath9k: fetch calibration data via nvmem subsystem")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

Patch applied to ath-next branch of ath.git, thanks.

57671351379b ath9k: fix an IS_ERR() vs NULL check
diff mbox series

Patch

diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index 1568730fc01e..335e10133926 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -610,8 +610,8 @@  static int ath9k_nvmem_request_eeprom(struct ath_softc *sc)
 	/* devres manages the calibration values release on shutdown */
 	ah->nvmem_blob = (u16 *)devm_kmemdup(sc->dev, buf, len, GFP_KERNEL);
 	kfree(buf);
-	if (IS_ERR(ah->nvmem_blob))
-		return PTR_ERR(ah->nvmem_blob);
+	if (!ah->nvmem_blob)
+		return -ENOMEM;
 
 	ah->nvmem_blob_len = len;
 	ah->ah_flags &= ~AH_USE_EEPROM;