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

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

rt2x00: RF3052 is a valid RF chipset for USB devices as well. 



The RF3052 chipset is now also being integrated onto USB devices, so
allow the RF chipset and don't treat it as PCI/SOC only.

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

drivers/net/wireless/rt2x00/rt2800lib.c

+3 −2
Original line number Diff line number Diff line
@@ -1862,7 +1862,8 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	    !rt2x00_rf(rt2x00dev, RF3020) &&

	    !rt2x00_rf(rt2x00dev, RF2020) &&

	    !rt2x00_rf(rt2x00dev, RF3021) &&

	    !rt2x00_rf(rt2x00dev, RF3022)) {

	    !rt2x00_rf(rt2x00dev, RF3022) &&

	    !rt2x00_rf(rt2x00dev, RF3052)) {

		ERROR(rt2x00dev, "Invalid RF chipset detected.\n");

		return -ENODEV;

	}
@@ -2047,7 +2048,7 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev) 


	if (rt2x00_rf(rt2x00dev, RF2820) ||

	    rt2x00_rf(rt2x00dev, RF2720) ||

	    (rt2x00_intf_is_pci(rt2x00dev) && rt2x00_rf(rt2x00dev, RF3052))) {

	    rt2x00_rf(rt2x00dev, RF3052)) {

		spec->num_channels = 14;

		spec->channels = rf_vals;

	} else if (rt2x00_rf(rt2x00dev, RF2850) || rt2x00_rf(rt2x00dev, RF2750)) {