diff options
-rw-r--r-- | drivers/pcmcia/cs_internal.h | 1 | ||||
-rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h index 4d5ffdcfeca3..55867bc7f199 100644 --- a/drivers/pcmcia/cs_internal.h +++ b/drivers/pcmcia/cs_internal.h | |||
@@ -42,7 +42,6 @@ typedef struct region_t { | |||
42 | typedef struct config_t { | 42 | typedef struct config_t { |
43 | u_int state; | 43 | u_int state; |
44 | u_int Attributes; | 44 | u_int Attributes; |
45 | u_int Vcc, Vpp1, Vpp2; | ||
46 | u_int IntType; | 45 | u_int IntType; |
47 | u_int ConfigBase; | 46 | u_int ConfigBase; |
48 | u_char Status, Pin, Copy, Option, ExtStatus; | 47 | u_char Status, Pin, Copy, Option, ExtStatus; |
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; |