summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2011-02-10 16:29:52 +0000
committerShaun Ruffell <sruffell@digium.com>2011-02-10 16:29:52 +0000
commit9a4febdd64b2f0a8e71a8ac8c694f3fcd05d287c (patch)
treeac3e660f694176af82432894f3185c6d8e0a3479
parent06598e146c2b17e4ffb21549fc2cb02294112e80 (diff)
wct4xxp: Do not lock interrupts while loading the VPM firmware.
Since the oct6100 API consumes less stack there is no longer a danger of overflowing our stack during load. Signed-off-by: Shaun Ruffell <sruffell@digium.com> Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9752 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9755 a0bf4364-ded3-4de4-8d8a-66a801d63aff
-rw-r--r--drivers/dahdi/wct4xxp/vpm450m.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/dahdi/wct4xxp/vpm450m.c b/drivers/dahdi/wct4xxp/vpm450m.c
index a6931fb..b72343b 100644
--- a/drivers/dahdi/wct4xxp/vpm450m.c
+++ b/drivers/dahdi/wct4xxp/vpm450m.c
@@ -425,9 +425,6 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
UINT32 ulResult;
struct vpm450m *vpm450m;
int x,y,law;
-#ifdef CONFIG_4KSTACKS
- unsigned long flags;
-#endif
if (!(vpm450m = kmalloc(sizeof(struct vpm450m), GFP_KERNEL)))
return NULL;
@@ -502,20 +499,9 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
return NULL;
}
- /* I don't know what to curse more in this comment, the problems caused by
- * the 4K kernel stack limit change or the octasic API for being so darn
- * stack unfriendly. Stupid, stupid, stupid. So we disable IRQs so we
- * don't run the risk of overflowing the stack while we initialize the
- * octasic. */
-#ifdef CONFIG_4KSTACKS
- local_irq_save(flags);
-#endif
ulResult = Oct6100ChipOpen(vpm450m->pApiInstance, ChipOpen);
if (ulResult != cOCT6100_ERR_OK) {
printk(KERN_NOTICE "Failed to open chip, code %08x!\n", ulResult);
-#ifdef CONFIG_4KSTACKS
- local_irq_restore(flags);
-#endif
vfree(vpm450m->pApiInstance);
kfree(vpm450m);
kfree(ChipOpen);
@@ -572,9 +558,6 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
}
}
-#ifdef CONFIG_4KSTACKS
- local_irq_restore(flags);
-#endif
kfree(ChipOpen);
kfree(ChannelOpen);
return vpm450m;