|
@@ -447,7 +447,7 @@ int pcmcia_modify_configuration(struct pcmcia_device *p_dev,
|
|
|
(mod->Attributes & CONF_VPP2_CHANGE_VALID)) {
|
|
|
if (mod->Vpp1 != mod->Vpp2)
|
|
|
return CS_BAD_VPP;
|
|
|
- c->Vpp1 = c->Vpp2 = s->socket.Vpp = mod->Vpp1;
|
|
|
+ s->socket.Vpp = mod->Vpp1;
|
|
|
if (s->ops->set_socket(s, &s->socket))
|
|
|
return CS_BAD_VPP;
|
|
|
} else if ((mod->Attributes & CONF_VPP1_CHANGE_VALID) ||
|
|
@@ -623,8 +623,6 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev,
|
|
|
if (s->ops->set_socket(s, &s->socket))
|
|
|
return CS_BAD_VPP;
|
|
|
|
|
|
- c->Vcc = req->Vcc; c->Vpp1 = c->Vpp2 = req->Vpp1;
|
|
|
-
|
|
|
/* Pick memory or I/O card, DMA mode, interrupt */
|
|
|
c->IntType = req->IntType;
|
|
|
c->Attributes = req->Attributes;
|