diff options
Diffstat (limited to 'drivers/pcmcia/pcmcia_resource.c')
-rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index 16504f852af2..17e2fbf26e14 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c | |||
@@ -618,11 +618,7 @@ int pcmcia_request_configuration(struct pcmcia_device *p_dev, | |||
618 | return CS_CONFIGURATION_LOCKED; | 618 | return CS_CONFIGURATION_LOCKED; |
619 | 619 | ||
620 | /* Do power control. We don't allow changes in Vcc. */ | 620 | /* Do power control. We don't allow changes in Vcc. */ |
621 | if (s->socket.Vcc != req->Vcc) | 621 | s->socket.Vpp = req->Vpp; |
622 | return CS_BAD_VCC; | ||
623 | if (req->Vpp1 != req->Vpp2) | ||
624 | return CS_BAD_VPP; | ||
625 | s->socket.Vpp = req->Vpp1; | ||
626 | if (s->ops->set_socket(s, &s->socket)) | 622 | if (s->ops->set_socket(s, &s->socket)) |
627 | return CS_BAD_VPP; | 623 | return CS_BAD_VPP; |
628 | 624 | ||