linux-mips
[Top] [All Lists]

[PATCH] MIPS: APRP: Fix breakage due to new wait_event interface.

To: linux-mips@linux-mips.org
Subject: [PATCH] MIPS: APRP: Fix breakage due to new wait_event interface.
From: "Steven J. Hill" <Steven.Hill@imgtec.com>
Date: Fri, 17 Jan 2014 10:47:07 -0600
Cc: blogic@openwrt.org
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
From: "Steven J. Hill" <Steven.Hill@imgtec.com>

Commit 35a2af94c7ce7130ca292c68b1d27fcfdb648f6b changed the
__wait_event*() interfaces. Fix the RTLX open() function to
use the new interface.

Signed-off-by: Steven J. Hill <Steven.Hill@imgtec.com>
---
 arch/mips/kernel/rtlx.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index 4658350..31b1b76 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -108,10 +108,9 @@ int rtlx_open(int index, int can_sleep)
                p = vpe_get_shared(aprp_cpu_index());
                if (p == NULL) {
                        if (can_sleep) {
-                               __wait_event_interruptible(
+                               ret = __wait_event_interruptible(
                                        channel_wqs[index].lx_queue,
-                                       (p = vpe_get_shared(aprp_cpu_index())),
-                                       ret);
+                                       (p = vpe_get_shared(aprp_cpu_index())));
                                if (ret)
                                        goto out_fail;
                        } else {
-- 
1.7.10.4


<Prev in Thread] Current Thread [Next in Thread>