From: Brian Norris <briannorris@chromium.org>
To: ath10k@lists.infradead.org
Cc: linux-wireless@vger.kernel.org,
Rakesh Pillai <pillair@qti.qualcomm.com>,
Govind Singh <govinds@qti.qualcomm.com>,
<linux-kernel@vger.kernel.org>,
Brian Norris <briannorris@chromium.org>
Subject: [PATCH 2/3] ath10k: don't assume this is a PCI dev in generic code
Date: Fri, 2 Nov 2018 10:17:48 -0700 [thread overview]
Message-ID: <20181102171749.38680-2-briannorris@chromium.org> (raw)
In-Reply-To: <20181102171749.38680-1-briannorris@chromium.org>
Not all devices using this driver are backed by a PCI device, so it's
not fair to assume 'to_pci_dev()' is valid. Fortunately, we only were
using this to convert straight back to a bare 'device', which means we
were only doing no-op pointer arithmetic, and not actually accessing
potentially out-of-bounds memory. But this is still bad practice.
Just use 'ar->dev' directly, since that's really all we're looking for.
Fixes: 209b2a68de76 ("ath10k: add platform regulatory domain support")
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
drivers/net/wireless/ath/ath10k/mac.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index a1c2801ded10..5c4ee66382d9 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -8313,7 +8313,6 @@ static u32 ath10k_mac_wrdd_get_mcc(struct ath10k *ar, union acpi_object *wrdd)
static int ath10k_mac_get_wrdd_regulatory(struct ath10k *ar, u16 *rd)
{
- struct pci_dev __maybe_unused *pdev = to_pci_dev(ar->dev);
acpi_handle root_handle;
acpi_handle handle;
struct acpi_buffer wrdd = {ACPI_ALLOCATE_BUFFER, NULL};
@@ -8321,7 +8320,7 @@ static int ath10k_mac_get_wrdd_regulatory(struct ath10k *ar, u16 *rd)
u32 alpha2_code;
char alpha2[3];
- root_handle = ACPI_HANDLE(&pdev->dev);
+ root_handle = ACPI_HANDLE(ar->dev);
if (!root_handle)
return -EOPNOTSUPP;
--
2.19.1.930.g4563a0d9d0-goog
next prev parent reply other threads:[~2018-11-02 17:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-02 17:17 [PATCH 1/3] ath10k: assign 'n_cipher_suites' for WCN3990 Brian Norris
2018-11-02 17:17 ` Brian Norris [this message]
2018-11-02 17:17 ` [PATCH 3/3] ath10k: fix struct init whitespace in SNOC driver Brian Norris
2018-11-06 16:23 ` [PATCH 1/3] ath10k: assign 'n_cipher_suites' for WCN3990 Kalle Valo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181102171749.38680-2-briannorris@chromium.org \
--to=briannorris@chromium.org \
--cc=ath10k@lists.infradead.org \
--cc=govinds@qti.qualcomm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=pillair@qti.qualcomm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).