aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/pata_pcmcia.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index e944aa0c5517..12cdc9ff39ad 100644
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -194,9 +194,9 @@ static int pcmcia_check_one_config(struct pcmcia_device *pdev,
194 } 194 }
195 195
196 if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM)) 196 if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM))
197 pdev->conf.Vpp = cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000; 197 pdev->vpp = cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
198 else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM)) 198 else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM))
199 pdev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000; 199 pdev->vpp = dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
200 200
201 if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) { 201 if ((cfg->io.nwin > 0) || (dflt->io.nwin > 0)) {
202 cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io; 202 cistpl_io_t *io = (cfg->io.nwin) ? &cfg->io : &dflt->io;