pcmcia: move Vpp setup to struct pcmcia_device

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / atmel_cs.c

diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 3b632161c10696ee7ae896db24c11d4886395486..479f5084bac13b783acd3e79b720a8c2c2b2387d 100644 (file)
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -183,9 +183,9 @@ static int atmel_config_check(struct pcmcia_device *p_dev,
        /* Use power settings for Vcc and Vpp if present */
        /*  Note that the CIS values need to be rescaled */
        if (cfg->vpp1.present & (1<<CISTPL_POWER_VNOM))
-               p_dev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
+               p_dev->vpp = cfg->vpp1.param[CISTPL_POWER_VNOM]/10000;
        else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))
-               p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
+               p_dev->vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
 
        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;