ar9170usb: LEDs are confused

Commit Message

Joerg Albert Oct. 2, 2009, 11:03 p.m. UTC

None

Patch

diff --git a/drivers/net/wireless/ath/ar9170/hw.h b/drivers/net/wireless/ath/ar9170/hw.h
index 6cbfb2f..74b619c 100644
--- a/drivers/net/wireless/ath/ar9170/hw.h
+++ b/drivers/net/wireless/ath/ar9170/hw.h
@@ -77,6 +77,7 @@  enum ar9170_cmd {
 #define AR9170_EP_IRQ				3
 #define AR9170_EP_CMD				4
 
+#define AR9170_EEPROM_HWTYPE                    0x1374
 #define AR9170_EEPROM_START			0x1600
 
 #define AR9170_GPIO_REG_BASE			0x1d0100
diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c
index c1f8c69..bffd6c4 100644
--- a/drivers/net/wireless/ath/ar9170/main.c
+++ b/drivers/net/wireless/ath/ar9170/main.c
@@ -2598,6 +2598,7 @@  static int ar9170_read_eeprom(struct ar9170 *ar)
 	__le32 offsets[RW];
 	unsigned int rx_streams, tx_streams, tx_params = 0;
 	int i, j, err, bands = 0;
+	u32 hwtype;
 
 	BUILD_BUG_ON(sizeof(ar->eeprom) & 3);
 
@@ -2665,6 +2666,14 @@  static int ar9170_read_eeprom(struct ar9170 *ar)
 	/* second part of wiphy init */
 	SET_IEEE80211_PERM_ADDR(ar->hw, addr);
 
+	/* read hw type (aka the led modes) */
+	err = ar9170_read_reg(ar, AR9170_EEPROM_HWTYPE, &hwtype);
+	if (err)
+		return err;
+	/* jal: for debugging only */
+	printk(KERN_INFO "%s: hwtype %08x\n",
+	       wiphy_name(ar->hw->wiphy), hwtype);
+
 	return bands ? 0 : -EINVAL;
 }