aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/pcmcia
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/pcmcia')
-rw-r--r--drivers/scsi/pcmcia/nsp_cs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index e872e0684273..50574e869418 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1624,10 +1624,10 @@ static int nsp_cs_config_check(struct pcmcia_device *p_dev,
1624 } 1624 }
1625 1625
1626 if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM)) { 1626 if (cfg->vpp1.present & (1 << CISTPL_POWER_VNOM)) {
1627 p_dev->conf.Vpp = 1627 p_dev->vpp =
1628 cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000; 1628 cfg->vpp1.param[CISTPL_POWER_VNOM] / 10000;
1629 } else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM)) { 1629 } else if (dflt->vpp1.present & (1 << CISTPL_POWER_VNOM)) {
1630 p_dev->conf.Vpp = 1630 p_dev->vpp =
1631 dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000; 1631 dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
1632 } 1632 }
1633 1633
@@ -1749,8 +1749,8 @@ static int nsp_cs_config(struct pcmcia_device *link)
1749 /* Finally, report what we've done */ 1749 /* Finally, report what we've done */
1750 printk(KERN_INFO "nsp_cs: index 0x%02x: ", 1750 printk(KERN_INFO "nsp_cs: index 0x%02x: ",
1751 link->conf.ConfigIndex); 1751 link->conf.ConfigIndex);
1752 if (link->conf.Vpp) { 1752 if (link->vpp) {
1753 printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10); 1753 printk(", Vpp %d.%d", link->vpp/10, link->vpp%10);
1754 } 1754 }
1755 if (link->conf.Attributes & CONF_ENABLE_IRQ) { 1755 if (link->conf.Attributes & CONF_ENABLE_IRQ) {
1756 printk(", irq %d", link->irq); 1756 printk(", irq %d", link->irq);