lkml.org 
[lkml]   [2011]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 026/247] staging: comedi: ni_labpc: Use shared IRQ for PCMCIA card
    Date
    From: Ian Abbott <abbotti@mev.co.uk>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    If you see a problem with using this for longterm, please comment.
    -------------------

    commit d1ce318496f5943d2cc5e20171fc383a59a1421f upstream.

    The ni_labpc driver module only requests a shared IRQ for PCI devices,
    requesting a non-shared IRQ for non-PCI devices.
    As this module is also used by the ni_labpc_cs module for certain
    National Instruments PCMCIA cards, it also needs to request a shared IRQ
    for PCMCIA devices, otherwise you get a IRQ mismatch with the CardBus
    controller.

    Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    drivers/staging/comedi/drivers/ni_labpc.c | 3 ++-
    1 files changed, 2 insertions(+), 1 deletions(-)

    diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c
    index 558e525..3f4fbfe 100644
    --- a/drivers/staging/comedi/drivers/ni_labpc.c
    +++ b/drivers/staging/comedi/drivers/ni_labpc.c
    @@ -572,7 +572,8 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
    /* grab our IRQ */
    if (irq) {
    isr_flags = 0;
    - if (thisboard->bustype == pci_bustype)
    + if (thisboard->bustype == pci_bustype
    + || thisboard->bustype == pcmcia_bustype)
    isr_flags |= IRQF_SHARED;
    if (request_irq(irq, labpc_interrupt, isr_flags,
    driver_labpc.driver_name, dev)) {
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-06-23 20:31    [W:4.171 / U:0.456 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site