From b85127afc162c15d4f5dbd0dede6f7a1a73d62f4 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Sun, 8 Nov 2009 14:39:55 +0100 Subject: [PATCH] --- yaml --- r: 171725 b: refs/heads/master c: 40beee5c15a816bf77747e15940ac3b97229faf4 h: refs/heads/master i: 171723: 33073dcd0987fde53f0b6f7ece954a36a0f4d121 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rt2x00/rt2800usb.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d407d8d245ca..a50bccb4f928 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30e840346c516ad4e36f710fa485933ccc7afa66 +refs/heads/master: 40beee5c15a816bf77747e15940ac3b97229faf4 diff --git a/trunk/drivers/net/wireless/rt2x00/rt2800usb.c b/trunk/drivers/net/wireless/rt2x00/rt2800usb.c index a6b0484d5816..54afbc8378df 100644 --- a/trunk/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/trunk/drivers/net/wireless/rt2x00/rt2800usb.c @@ -667,7 +667,11 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry, */ static int rt2800usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) { - rt2x00usb_eeprom_read(rt2x00dev, rt2x00dev->eeprom, EEPROM_SIZE); + if (rt2800_efuse_detect(rt2x00dev)) + rt2800_read_eeprom_efuse(rt2x00dev); + else + rt2x00usb_eeprom_read(rt2x00dev, rt2x00dev->eeprom, + EEPROM_SIZE); return rt2800_validate_eeprom(rt2x00dev); }