Home » Mailing list archives » linux-ath5k-devel » 2010 » November » 26

[ath5k-devel] [PATCH v6 5/9] ath5k: Check if pci pdev struct is initialized in common functions.

Previous thread: [ath5k-devel] [PATCH v6 3/9] ath5k: Move PCI bus functions to separate file. by Wojciech Dubowik on Friday, November 26, 2010 - 2:56 am. (1 message)

Next thread: [ath5k-devel] [PATCH v6 6/9] ath5k: Add a function to read chipset's MAC revision by Wojciech Dubowik on Friday, November 26, 2010 - 2:57 am. (3 messages)
[view original message]
From: Wojciech Dubowik
Subject: [ath5k-devel] [PATCH v6 5/9] ath5k: Check if pci pdev struct is initialized in common functions.
Date: Friday, November 26, 2010 - 2:56 am

From: Felix Fietkau <nbd@openwrt.org>

To be able to support other busses than PCI check if pci device
structure is initialized.

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: Wojciech Dubowik <Wojciech.Dubowik@neratec.com>
---
 drivers/net/wireless/ath/ath5k/attach.c |    5 ++---
 drivers/net/wireless/ath/ath5k/led.c    |    5 ++++-
 drivers/net/wireless/ath/ath5k/reset.c  |    4 ++--
 drivers/net/wireless/ath/ath5k/sysfs.c  |    4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c
index 042b537..fe7e6f1 100644
--- a/drivers/net/wireless/ath/ath5k/attach.c
+++ b/drivers/net/wireless/ath/ath5k/attach.c
@@ -273,7 +273,7 @@ int ath5k_hw_init(struct ath5k_softc *sc)
 	/*
 	 * Write PCI-E power save settings
 	 */
-	if ((ah->ah_version == AR5K_AR5212) && (pdev->is_pcie)) {
+	if ((ah->ah_version == AR5K_AR5212) && pdev && (pdev->is_pcie)) {
 		ath5k_hw_reg_write(ah, 0x9248fc00, AR5K_PCIE_SERDES);
 		ath5k_hw_reg_write(ah, 0x24924924, AR5K_PCIE_SERDES);
 
@@ -305,8 +305,7 @@ int ath5k_hw_init(struct ath5k_softc *sc)
 	/* Get misc capabilities */
 	ret = ath5k_hw_set_capabilities(ah);
 	if (ret) {
-		ATH5K_ERR(sc, "unable to get device capabilities: 0x%04x\n",
-			sc->pdev->device);
+		ATH5K_ERR(sc, "unable to get device capabilities\n");
 		goto err;
 	}
 
diff --git a/drivers/net/wireless/ath/ath5k/led.c b/drivers/net/wireless/ath/ath5k/led.c
index 67aa52e..1f5a991 100644
--- a/drivers/net/wireless/ath/ath5k/led.c
+++ b/drivers/net/wireless/ath/ath5k/led.c
@@ -133,7 +133,7 @@ ath5k_register_led(struct ath5k_softc *sc, struct ath5k_led *led,
 	led->led_dev.default_trigger = trigger;
 	led->led_dev.brightness_set = ath5k_led_brightness_set;
 
-	err = led_classdev_register(&sc->pdev->dev, &led->led_dev);
+	err = led_classdev_register(sc->dev, &led->led_dev);
 	if (err) {
 		ATH5K_WARN(sc, "could not register LED %s\n", name);
 		led->sc = NULL;
@@ ...
[ message continues ]
Previous thread: [ath5k-devel] [PATCH v6 3/9] ath5k: Move PCI bus functions to separate file. by Wojciech Dubowik on Friday, November 26, 2010 - 2:56 am. (1 message)

Next thread: [ath5k-devel] [PATCH v6 6/9] ath5k: Add a function to read chipset's MAC revision by Wojciech Dubowik on Friday, November 26, 2010 - 2:57 am. (3 messages)