diff options
Diffstat (limited to 'drivers/pcmcia/pcmcia_resource.c')
-rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index deb6d00bc2ff..89022ad5b520 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c | |||
@@ -820,7 +820,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
820 | ((req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) || | 820 | ((req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) || |
821 | (s->functions > 1) || | 821 | (s->functions > 1) || |
822 | (irq == s->pci_irq)) ? SA_SHIRQ : 0, | 822 | (irq == s->pci_irq)) ? SA_SHIRQ : 0, |
823 | p_dev->dev.bus_id, | 823 | p_dev->devname, |
824 | (req->Attributes & IRQ_HANDLE_PRESENT) ? req->Instance : data); | 824 | (req->Attributes & IRQ_HANDLE_PRESENT) ? req->Instance : data); |
825 | if (!ret) { | 825 | if (!ret) { |
826 | if (!(req->Attributes & IRQ_HANDLE_PRESENT)) | 826 | if (!(req->Attributes & IRQ_HANDLE_PRESENT)) |
@@ -842,7 +842,7 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) | |||
842 | ((req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) || | 842 | ((req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) || |
843 | (s->functions > 1) || | 843 | (s->functions > 1) || |
844 | (irq == s->pci_irq)) ? SA_SHIRQ : 0, | 844 | (irq == s->pci_irq)) ? SA_SHIRQ : 0, |
845 | p_dev->dev.bus_id, req->Instance)) | 845 | p_dev->devname, req->Instance)) |
846 | return CS_IN_USE; | 846 | return CS_IN_USE; |
847 | } | 847 | } |
848 | 848 | ||