Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / isdn / hardware / mISDN / mISDNinfineon.c

diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
index af25e1f3efd4a784daa5aa78128e908e07cef648..bc0529ac88a10ecaa011937a9828b8ba2e87b757 100644 (file)
--- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c
+++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c
@@ -420,7 +420,7 @@ enable_hwirq(struct inf_hw *hw)
                break;
        case INF_NICCY:
                val = inl((u32)hw->cfg.start + NICCY_IRQ_CTRL_REG);
-               val |= NICCY_IRQ_ENABLE;;
+               val |= NICCY_IRQ_ENABLE;
                outl(val, (u32)hw->cfg.start + NICCY_IRQ_CTRL_REG);
                break;
        case INF_SCT_1:
@@ -563,7 +563,7 @@ reset_inf(struct inf_hw *hw)
                mdelay(10);
                hw->ipac.isac.adf2 = 0x87;
                hw->ipac.hscx[0].slot = 0x1f;
-               hw->ipac.hscx[0].slot = 0x23;
+               hw->ipac.hscx[1].slot = 0x23;
                break;
        case INF_GAZEL_R753:
                val = inl((u32)hw->cfg.start + GAZEL_CNTRL);
@@ -924,7 +924,7 @@ setup_instance(struct inf_hw *card)
                mISDNipac_init(&card->ipac, card);
 
        if (card->ipac.isac.dch.dev.Bprotocols == 0)
-               goto error_setup;;
+               goto error_setup;
 
        err = mISDN_register_device(&card->ipac.isac.dch.dev,
                &card->pdev->dev, card->name);