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

Commit 1f51d580 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

vt6655: Fix late setting of byRFType. 



byRFType is not set prior to registration of mac80211 causing
unpredictable operation after channel scans.

With byRFType unset all channels are enabled this causes tx power
to be set to values not present its eeprom.

Move setting of this variable to vt6655_probe.

byRFType must have a mask set. byRevId not used by driver and
is removed.

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Cc: <stable@vger.kernel.org> # v3.19+
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 40c8790b

drivers/staging/vt6655/device_main.c

+6 −10
Original line number Diff line number Diff line
@@ -330,16 +330,6 @@ static void device_init_registers(struct vnt_private *pDevice) 
	/* zonetype initial */

	pDevice->byOriginalZonetype = pDevice->abyEEPROM[EEP_OFS_ZONETYPE];



	/* Get RFType */

	pDevice->byRFType = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_RFTYPE);



	/* force change RevID for VT3253 emu */

	if ((pDevice->byRFType & RF_EMU) != 0)

			pDevice->byRevId = 0x80;



	pDevice->byRFType &= RF_MASK;

	pr_debug("pDevice->byRFType = %x\n", pDevice->byRFType);



	if (!pDevice->bZoneRegExist)

		pDevice->byZoneType = pDevice->abyEEPROM[EEP_OFS_ZONETYPE];
@@ -1780,6 +1770,12 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) 
	MACvInitialize(priv->PortOffset);

	MACvReadEtherAddress(priv->PortOffset, priv->abyCurrentNetAddr);



	/* Get RFType */

	priv->byRFType = SROMbyReadEmbedded(priv->PortOffset, EEP_OFS_RFTYPE);

	priv->byRFType &= RF_MASK;



	dev_dbg(&pcid->dev, "RF Type = %x\n", priv->byRFType);



	device_get_options(priv);

	device_set_options(priv);

	/* Mask out the options cannot be set to the chip */