diff options
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index f5c5872b587e..03b2a90b9ac0 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c | |||
| @@ -330,16 +330,6 @@ static void device_init_registers(struct vnt_private *pDevice) | |||
| 330 | /* zonetype initial */ | 330 | /* zonetype initial */ |
| 331 | pDevice->byOriginalZonetype = pDevice->abyEEPROM[EEP_OFS_ZONETYPE]; | 331 | pDevice->byOriginalZonetype = pDevice->abyEEPROM[EEP_OFS_ZONETYPE]; |
| 332 | 332 | ||
| 333 | /* Get RFType */ | ||
| 334 | pDevice->byRFType = SROMbyReadEmbedded(pDevice->PortOffset, EEP_OFS_RFTYPE); | ||
| 335 | |||
| 336 | /* force change RevID for VT3253 emu */ | ||
| 337 | if ((pDevice->byRFType & RF_EMU) != 0) | ||
| 338 | pDevice->byRevId = 0x80; | ||
| 339 | |||
| 340 | pDevice->byRFType &= RF_MASK; | ||
| 341 | pr_debug("pDevice->byRFType = %x\n", pDevice->byRFType); | ||
| 342 | |||
| 343 | if (!pDevice->bZoneRegExist) | 333 | if (!pDevice->bZoneRegExist) |
| 344 | pDevice->byZoneType = pDevice->abyEEPROM[EEP_OFS_ZONETYPE]; | 334 | pDevice->byZoneType = pDevice->abyEEPROM[EEP_OFS_ZONETYPE]; |
| 345 | 335 | ||
| @@ -1780,6 +1770,12 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) | |||
| 1780 | MACvInitialize(priv->PortOffset); | 1770 | MACvInitialize(priv->PortOffset); |
| 1781 | MACvReadEtherAddress(priv->PortOffset, priv->abyCurrentNetAddr); | 1771 | MACvReadEtherAddress(priv->PortOffset, priv->abyCurrentNetAddr); |
| 1782 | 1772 | ||
| 1773 | /* Get RFType */ | ||
| 1774 | priv->byRFType = SROMbyReadEmbedded(priv->PortOffset, EEP_OFS_RFTYPE); | ||
| 1775 | priv->byRFType &= RF_MASK; | ||
| 1776 | |||
| 1777 | dev_dbg(&pcid->dev, "RF Type = %x\n", priv->byRFType); | ||
| 1778 | |||
| 1783 | device_get_options(priv); | 1779 | device_get_options(priv); |
| 1784 | device_set_options(priv); | 1780 | device_set_options(priv); |
| 1785 | /* Mask out the options cannot be set to the chip */ | 1781 | /* Mask out the options cannot be set to the chip */ |
