DSPBRIDGE: Fix declaration and initialization of sync objects.

Commit Message

Guzman Lugo, Fernando April 19, 2010, 10:51 p.m. UTC

None

Patch

diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c
index d62e508..1dd635e 100644
--- a/drivers/dsp/bridge/rmgr/drv_interface.c
+++ b/drivers/dsp/bridge/rmgr/drv_interface.c
@@ -98,8 +98,8 @@  static int tc_wordswapon;	/* Default value is always false */
 static atomic_t bridge_cref;	/* number of bridge open handles */
 static struct workqueue_struct *bridge_rec_queue;
 static struct work_struct bridge_recovery_work;
-static DECLARE_COMPLETION_ONSTACK(bridge_comp);
-static DECLARE_COMPLETION_ONSTACK(bridge_open_comp);
+static DECLARE_COMPLETION(bridge_comp);
+static DECLARE_COMPLETION(bridge_open_comp);
 static bool recover;
 #endif
 
diff --git a/drivers/dsp/bridge/wmd/msg_sm.c b/drivers/dsp/bridge/wmd/msg_sm.c
index 19e3cee..6f00071 100644
--- a/drivers/dsp/bridge/wmd/msg_sm.c
+++ b/drivers/dsp/bridge/wmd/msg_sm.c
@@ -185,8 +185,8 @@  dsp_status bridge_msg_create_queue(struct msg_mgr *hmsg_mgr,
 	if (DSP_SUCCEEDED(status)) {
 		msg_q->sync_done = kzalloc(sizeof(struct sync_object),
 							GFP_KERNEL);
-		if (msg_q->sync_event)
-			sync_init_event(msg_q->sync_event);
+		if (msg_q->sync_done)
+			sync_init_event(msg_q->sync_done);
 		else
 			status = DSP_EMEMORY;
 	}
@@ -194,7 +194,7 @@  dsp_status bridge_msg_create_queue(struct msg_mgr *hmsg_mgr,
 	if (DSP_SUCCEEDED(status)) {
 		msg_q->sync_done_ack = kzalloc(sizeof(struct sync_object),
 							GFP_KERNEL);
-		if (msg_q->sync_event)
+		if (msg_q->sync_done_ack)
 			sync_init_event(msg_q->sync_done_ack);
 		else
 			status = DSP_EMEMORY;