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

Commit 8d8acd46 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Fix VGC lower bound initialization 



When the EEPROM_BBPTUNE_VGC word is valid, we should
override EEPROM_BBPTUNE_VGCLOWER field with the BBP
value.

And we should _not_ do that when EEPROM_BBPTUNE_R17 is valid.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e6d3e902

drivers/net/wireless/rt2x00/rt2500usb.c

+3 −3
Original line number Diff line number Diff line
@@ -1376,6 +1376,9 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);

		EEPROM(rt2x00dev, "BBPtune vgc: 0x%04x\n", word);

	} else {

		rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R17, &word);
@@ -1384,9 +1387,6 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) 
		rt2x00_set_field16(&word, EEPROM_BBPTUNE_R17_HIGH, 0x41);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_R17, word);

		EEPROM(rt2x00dev, "BBPtune r17: 0x%04x\n", word);

	} else {

		rt2x00_set_field16(&word, EEPROM_BBPTUNE_VGCLOWER, bbp);

		rt2x00_eeprom_write(rt2x00dev, EEPROM_BBPTUNE_VGC, word);

	}



	rt2x00_eeprom_read(rt2x00dev, EEPROM_BBPTUNE_R24, &word);