Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79169f14 authored by Brian Norris's avatar Brian Norris Committed by Kalle Valo
Browse files

ath10k: don't assume this is a PCI dev in generic code 



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: 209b2a68 ("ath10k: add platform regulatory domain support")
Signed-off-by: default avatarBrian Norris <briannorris@chromium.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 2bd345cd

drivers/net/wireless/ath/ath10k/mac.c

+1 −2
Original line number Diff line number Diff line
@@ -8317,7 +8317,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};
@@ -8325,7 +8324,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;