diff options
| -rw-r--r-- | drivers/dahdi/voicebus/GpakCust.c | 3 | ||||
| -rw-r--r-- | drivers/dahdi/wctdm24xxp/base.c | 7 | ||||
| -rw-r--r-- | drivers/dahdi/wcte12xp/base.c | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/drivers/dahdi/voicebus/GpakCust.c b/drivers/dahdi/voicebus/GpakCust.c index a251d86..50f11b2 100644 --- a/drivers/dahdi/voicebus/GpakCust.c +++ b/drivers/dahdi/voicebus/GpakCust.c @@ -521,8 +521,9 @@ vpmadt032_init(struct vpmadt032 *vpm, struct voicebus *vb) return res; } vpm->curpage = -1; - set_bit(VPM150M_SWRESET, &vpm->control); + dev_info(&voicebus_get_pci_dev(vb)->dev, "Booting VPMADT032\n"); + set_bit(VPM150M_SWRESET, &vpm->control); while (test_bit(VPM150M_SWRESET, &vpm->control)) msleep(1); diff --git a/drivers/dahdi/wctdm24xxp/base.c b/drivers/dahdi/wctdm24xxp/base.c index a4de5fb..fd5ade7 100644 --- a/drivers/dahdi/wctdm24xxp/base.c +++ b/drivers/dahdi/wctdm24xxp/base.c @@ -459,7 +459,6 @@ static int config_vpmadt032(struct vpmadt032 *vpm, struct wctdm *wc) static inline void cmd_dequeue_vpmadt032(struct wctdm *wc, u8 *writechunk, int whichframe) { - unsigned long flags; struct vpmadt032_cmd *curcmd = NULL; struct vpmadt032 *vpmadt032 = wc->vpmadt032; int x; @@ -468,8 +467,6 @@ static inline void cmd_dequeue_vpmadt032(struct wctdm *wc, u8 *writechunk, int w /* Skip audio */ writechunk += 24; - spin_lock_irqsave(&wc->reglock, flags); - if (test_bit(VPM150M_SPIRESET, &vpmadt032->control) || test_bit(VPM150M_HPIRESET, &vpmadt032->control)) { if (debug & DEBUG_ECHOCAN) printk(KERN_INFO "HW Resetting VPMADT032...\n"); @@ -484,7 +481,6 @@ static inline void cmd_dequeue_vpmadt032(struct wctdm *wc, u8 *writechunk, int w writechunk[CMD_BYTE(x, 1, 0)] = 0; writechunk[CMD_BYTE(x, 2, 0)] = 0x00; } - spin_unlock_irqrestore(&wc->reglock, flags); return; } @@ -543,7 +539,6 @@ static inline void cmd_dequeue_vpmadt032(struct wctdm *wc, u8 *writechunk, int w writechunk[CMD_BYTE(27, 2, 0)] = 0; } } else if (test_and_clear_bit(VPM150M_SWRESET, &vpmadt032->control)) { - printk(KERN_INFO "Booting VPMADT032\n"); for (x = 24; x < 28; x++) { if (x == 24) writechunk[CMD_BYTE(x, 0, 0)] = (0x8 << 4); @@ -572,8 +567,6 @@ static inline void cmd_dequeue_vpmadt032(struct wctdm *wc, u8 *writechunk, int w if (test_bit(VPM150M_ACTIVE, &vpmadt032->control) && !whichframe && !(wc->intcount % 100)) { schedule_work(&vpmadt032->work); } - - spin_unlock_irqrestore(&wc->reglock, flags); } static inline void cmd_dequeue(struct wctdm *wc, unsigned char *writechunk, int card, int pos) diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index 7cc14d9..cf5906c 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -493,7 +493,6 @@ static void cmd_dequeue_vpmadt032(struct t1 *wc, unsigned char *writechunk, int writechunk[CMD_BYTE(4, 2, 1)] = 0; } } else if (test_and_clear_bit(VPM150M_SWRESET, &vpm->control)) { - debug_printk(1, "Booting VPMADT032\n"); for (x = 0; x < 7; x++) { if (0 == x) { writechunk[CMD_BYTE(x, 0, 1)] = (0x8 << 4); |