summaryrefslogtreecommitdiff
path: root/xivovp
diff options
context:
space:
mode:
Diffstat (limited to 'xivovp')
-rw-r--r--xivovp/base.c18
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);