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

Commit 20f8b139 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Correctly detect 93C86 EEPROMs in rt2800pci. 



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

drivers/net/wireless/rt2x00/rt2800pci.c

+12 −2
Original line number Original line Diff line number Diff line
@@ -139,8 +139,18 @@ static void rt2800pci_read_eeprom_pci(struct rt2x00_dev *rt2x00dev) 
	eeprom.data = rt2x00dev;

	eeprom.data = rt2x00dev;

	eeprom.register_read = rt2800pci_eepromregister_read;

	eeprom.register_read = rt2800pci_eepromregister_read;

	eeprom.register_write = rt2800pci_eepromregister_write;

	eeprom.register_write = rt2800pci_eepromregister_write;

	eeprom.width = !rt2x00_get_field32(reg, E2PROM_CSR_TYPE) ?

	switch (rt2x00_get_field32(reg, E2PROM_CSR_TYPE))

	    PCI_EEPROM_WIDTH_93C46 : PCI_EEPROM_WIDTH_93C66;

	{

	case 0:

		eeprom.width = PCI_EEPROM_WIDTH_93C46;

		break;

	case 1:

		eeprom.width = PCI_EEPROM_WIDTH_93C66;

		break;

	default:

		eeprom.width = PCI_EEPROM_WIDTH_93C86;

		break;

	}

	eeprom.reg_data_in = 0;

	eeprom.reg_data_in = 0;

	eeprom.reg_data_out = 0;

	eeprom.reg_data_out = 0;

	eeprom.reg_data_clock = 0;

	eeprom.reg_data_clock = 0;