diff options
| author | Guillaume Knispel <gknispel@avencall.com> | 2013-01-31 18:47:40 +0100 |
|---|---|---|
| committer | Guillaume Knispel <gknispel@avencall.com> | 2013-01-31 18:47:40 +0100 |
| commit | 32cdd1cafca041021082a1386f5a5b51a7f18cbc (patch) | |
| tree | d487990cab6b6dd4582d26debf32e8ef67f5c998 /xivovp | |
| parent | 4e3569ee7954248ba77174e760ba8311e32c49a3 (diff) | |
remove ref to megrez and TAINT_CRAP xivo_tdm
Diffstat (limited to 'xivovp')
| -rw-r--r-- | xivovp/base.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/xivovp/base.c b/xivovp/base.c index a8b8562..9f3cb1c 100644 --- a/xivovp/base.c +++ b/xivovp/base.c @@ -836,13 +836,13 @@ test_evb_ve890_init(void) } #ifdef AUDIO - if(wait_port0) + if (wait_port0) { /* UGLY EVIL HACK -1 */ xivo_tdm_register_port0_configured( xivovp.tdm_port, xivovp_port0_configured_cb, NULL); - else { + } else { xivovp_port0_configured_cb(NULL); xivovp_port0_started_cb(NULL); } @@ -877,7 +877,7 @@ xivovp_port0_configured_cb(void *data) printk(KERN_ERR "%s START\n", __func__); if ((rc = xivo_tdm_config_port(xivovp.tdm_port, - LE89316_MEGREZ_PROTO_XIVO_CONFIG, + LE89316_XIOH_CONFIG, NULL)) < 0) { printk(KERN_CRIT "%s: xivo_tdm_config_port returned %d\n", @@ -890,11 +890,13 @@ xivovp_port0_configured_cb(void *data) if (rc < 0) goto err_vp_init; - /* UGLY EVIL HACK */ - xivo_tdm_register_port0_started( - xivovp.tdm_port, - xivovp_port0_started_cb, - NULL); + if (wait_port0) { + /* UGLY EVIL HACK */ + xivo_tdm_register_port0_started( + xivovp.tdm_port, + xivovp_port0_started_cb, + NULL); + } mod_timer(&xivovp.vp_tick_timer, jiffies + VP_TICK_JIFFIES); |