lkml.org 
[lkml]   [2008]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 15/27] ATM: delay irq setup until card is configured
    2.6.22-stable review patch.  If anyone has any objections, please let us
    know.

    ------------------
    From: Chas Williams <chas@cmf.nrl.navy.mil>

    [ATM]: [nicstar] delay irq setup until card is configured

    [ Upstream commit: 52961955aa180959158faeb9fd6b4f8a591450f5 ]

    Signed-off-by: Chas Williams <chas@cmf.nrl.navy.mil>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/atm/nicstar.c | 19 +++++++++----------
    1 file changed, 9 insertions(+), 10 deletions(-)

    --- a/drivers/atm/nicstar.c
    +++ b/drivers/atm/nicstar.c
    @@ -625,14 +625,6 @@ static int __devinit ns_init_card(int i,
    if (mac[i] == NULL)
    nicstar_init_eprom(card->membase);

    - if (request_irq(pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, "nicstar", card) != 0)
    - {
    - printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
    - error = 9;
    - ns_init_card_error(card, error);
    - return error;
    - }
    -
    /* Set the VPI/VCI MSb mask to zero so we can receive OAM cells */
    writel(0x00000000, card->membase + VPM);

    @@ -858,8 +850,6 @@ static int __devinit ns_init_card(int i,
    card->iovpool.count++;
    }

    - card->intcnt = 0;
    -
    /* Configure NICStAR */
    if (card->rct_size == 4096)
    ns_cfg_rctsize = NS_CFG_RCTSIZE_4096_ENTRIES;
    @@ -868,6 +858,15 @@ static int __devinit ns_init_card(int i,

    card->efbie = 1;

    + card->intcnt = 0;
    + if (request_irq(pcidev->irq, &ns_irq_handler, IRQF_DISABLED | IRQF_SHARED, "nicstar", card) != 0)
    + {
    + printk("nicstar%d: can't allocate IRQ %d.\n", i, pcidev->irq);
    + error = 9;
    + ns_init_card_error(card, error);
    + return error;
    + }
    +
    /* Register device */
    card->atmdev = atm_dev_register("nicstar", &atm_ops, -1, NULL);
    if (card->atmdev == NULL)
    --


    \
     
     \ /
      Last update: 2008-02-02 01:33    [W:0.029 / U:0.156 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site