1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 599b116d9747..89022ad5b520 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,
             (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;
@@ -822,7 +820,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
                                           ((req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) ||
                                            (s->functions > 1) ||
                                            (irq == s->pci_irq)) ? SA_SHIRQ : 0,
-                                          p_dev->dev.bus_id,
+                                          p_dev->devname,
                                           (req->Attributes & IRQ_HANDLE_PRESENT) ? req->Instance : data);
                         if (!ret) {
                                 if (!(req->Attributes & IRQ_HANDLE_PRESENT))
@@ -832,7 +830,8 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
                 }
         }
 #endif
-        if (ret) {
+        /* only assign PCI irq if no IRQ already assigned */
+        if (ret && !s->irq.AssignedIRQ) {
                 if (!s->pci_irq)
                         return ret;
                 irq = s->pci_irq;
@@ -843,7 +842,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
                                 ((req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) ||
                                  (s->functions > 1) ||
                                  (irq == s->pci_irq)) ? SA_SHIRQ : 0,
-                                p_dev->dev.bus_id, req->Instance))
+                                p_dev->devname, req->Instance))
                         return CS_IN_USE;
         }