From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3D0821CA07; Mon, 2 Jun 2025 14:20:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748874029; cv=none; b=o06dUkeGG9oNf5feokQvt1rP+L9rSxUvGynzOvLaBskhVKZh6LpPYduYY9DwfcDc8TboAyz9vYQnP52SVKtOjtrdFtYUpb6o8EOrAvBs+YUiclLLNr925afI3n3Iwl9y3lK8Pga+cSR+7nwS39TIYzv+p9x6PKdAFAxYLUXyXAw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748874029; c=relaxed/simple; bh=WxU90/t7yUpxErsV4V6dEJWhngb5RXzCvlFP/fImx3s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=uGBWvfbD29AE4w8JeGbIvYnrmqc4NqYT2v1JZNFGGutlsH2dBZpWPbLYAxBgYKu4ZhQiTkzbrEibpCHAV2nzDtYkiiFKGBdrsxIouLW9G2yM9cQ/LOXGR+aEou4EDfDF5djvq7hyffRFRk6PJygnEj5S0kNALnTKeLZBOoALmiE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Uyh0RBIC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Uyh0RBIC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5F9BC4CEEB; Mon, 2 Jun 2025 14:20:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748874029; bh=WxU90/t7yUpxErsV4V6dEJWhngb5RXzCvlFP/fImx3s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Uyh0RBIC9hi8+Hpcg0MAWbExkOI2BObDx7DlhLFhYaIqZJX/BlVLvWulZulgOxGrC Nxu8WYebvygf1Su1Od2e6VGCLPiowLOmJscUmitTnqlIKLOoPAPi63Ov0witC/yCUd AkjQ/VYgmfd4LkA8LgSmaB+T85kQjkKF6zJlCnS4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Rosen Penev , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Jeff Johnson , Sasha Levin Subject: [PATCH 6.6 306/444] wifi: ath9k: return by of_get_mac_address Date: Mon, 2 Jun 2025 15:46:10 +0200 Message-ID: <20250602134353.353436711@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250602134340.906731340@linuxfoundation.org> References: <20250602134340.906731340@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rosen Penev [ Upstream commit dfffb317519f88534bb82797f055f0a2fd867e7b ] When using nvmem, ath9k could potentially be loaded before nvmem, which loads after mtd. This is an issue if DT contains an nvmem mac address. If nvmem is not ready in time for ath9k, -EPROBE_DEFER is returned. Pass it to _probe so that ath9k can properly grab a potentially present MAC address. Signed-off-by: Rosen Penev Acked-by: Toke Høiland-Jørgensen Link: https://patch.msgid.link/20241105222326.194417-1-rosenp@gmail.com Signed-off-by: Jeff Johnson Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath9k/init.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 4f00400c7ffb8..58386906598a7 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c @@ -691,7 +691,9 @@ static int ath9k_of_init(struct ath_softc *sc) ah->ah_flags |= AH_NO_EEP_SWAP; } - of_get_mac_address(np, common->macaddr); + ret = of_get_mac_address(np, common->macaddr); + if (ret == -EPROBE_DEFER) + return ret; return 0; } -- 2.39.5