aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/pcmcia_resource.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia/pcmcia_resource.c')
-rw-r--r--drivers/pcmcia/pcmcia_resource.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index c0f4eb49177b..deb6d00bc2ff 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -447,7 +447,7 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev,
447 (mod->Attributes & CONF_VPP2_CHANGE_VALID)) { 447 (mod->Attributes & CONF_VPP2_CHANGE_VALID)) {
448 if (mod->Vpp1 != mod->Vpp2) 448 if (mod->Vpp1 != mod->Vpp2)
449 return CS_BAD_VPP; 449 return CS_BAD_VPP;
450 c->Vpp1 = c->Vpp2 = s->socket.Vpp = mod->Vpp1; 450 s->socket.Vpp = mod->Vpp1;
451 if (s->ops->set_socket(s, &s->socket)) 451 if (s->ops->set_socket(s, &s->socket))
452 return CS_BAD_VPP; 452 return CS_BAD_VPP;
453 } else if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) || 453 } else if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) ||
@@ -623,8 +623,6 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
623 if (s->ops->set_socket(s, &s->socket)) 623 if (s->ops->set_socket(s, &s->socket))
624 return CS_BAD_VPP; 624 return CS_BAD_VPP;
625 625
626 c->Vcc = req->Vcc; c->Vpp1 = c->Vpp2 = req->Vpp1;
627
628 /* Pick memory or I/O card, DMA mode, interrupt */ 626 /* Pick memory or I/O card, DMA mode, interrupt */
629 c->IntType = req->IntType; 627 c->IntType = req->IntType;
630 c->Attributes = req->Attributes; 628 c->Attributes = req->Attributes;