From 1f10bc6c8e75a8126bb9e44cfae09d8484767c32 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sun, 5 Oct 2008 17:35:59 +0100 Subject: [PATCH] --- yaml --- r: 118141 b: refs/heads/master c: 7bbfd39bb9a5623cb8e0bcc54aee9b43d9ee97b9 h: refs/heads/master i: 118139: 333173d0f08c7f66b9426920ced0ae5b0f6f663c v: v3 --- [refs] | 2 +- trunk/drivers/pcmcia/pcmcia_resource.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b6bb2789e6f0..d56b49500156 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aafcf998c333a2a29e12093437eef32a60a8018d +refs/heads/master: 7bbfd39bb9a5623cb8e0bcc54aee9b43d9ee97b9 diff --git a/trunk/drivers/pcmcia/pcmcia_resource.c b/trunk/drivers/pcmcia/pcmcia_resource.c index afea2b2558b5..76d4a98f0955 100644 --- a/trunk/drivers/pcmcia/pcmcia_resource.c +++ b/trunk/drivers/pcmcia/pcmcia_resource.c @@ -693,8 +693,9 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) type = 0; if (s->functions > 1) /* All of this ought to be handled higher up */ type = IRQF_SHARED; - if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) + else if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING) type = IRQF_SHARED; + else printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n"); #ifdef CONFIG_PCMCIA_PROBE