From ebc6b9e66ef5d71c48f816db6413a4b1af7a427a Mon Sep 17 00:00:00 2001
From: Sacha <xsacha@gmail.com>
Date: Wed, 26 Mar 2014 10:29:17 +1000
Subject: [PATCH] Fix an assign. Some other misc changes.

---
 rpcs3/Emu/SysCalls/Modules/cellDmux.h | 23 +++++++++--------------
 rpcs3/Emu/SysCalls/lv2/SC_Lwmutex.cpp |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/rpcs3/Emu/SysCalls/Modules/cellDmux.h b/rpcs3/Emu/SysCalls/Modules/cellDmux.h
index f138d56db6..e57aca33c3 100644
--- a/rpcs3/Emu/SysCalls/Modules/cellDmux.h
+++ b/rpcs3/Emu/SysCalls/Modules/cellDmux.h
@@ -8,11 +8,11 @@
 // Error Codes
 enum
 {
-	CELL_DMUX_ERROR_ARG		= 0x80610201,
-	CELL_DMUX_ERROR_SEQ		= 0x80610202,
-	CELL_DMUX_ERROR_BUSY	= 0x80610203,
-	CELL_DMUX_ERROR_EMPTY	= 0x80610204,
-	CELL_DMUX_ERROR_FATAL	= 0x80610205,
+	CELL_DMUX_ERROR_ARG     = 0x80610201,
+	CELL_DMUX_ERROR_SEQ     = 0x80610202,
+	CELL_DMUX_ERROR_BUSY    = 0x80610203,
+	CELL_DMUX_ERROR_EMPTY   = 0x80610204,
+	CELL_DMUX_ERROR_FATAL   = 0x80610205,
 };
 
 enum CellDmuxStreamType 
@@ -605,14 +605,9 @@ public:
 				//(u32)info->auSize, put, (u32)info->ptsLower);
 
 			u32 new_addr = a128(put + 128 + size);
-			if ((new_addr + GetMaxAU()) > (memAddr + memSize))
-			{
-				put = memAddr;
-			}
-			else
-			{
-				put = new_addr;
-			}
+			put = ((new_addr + GetMaxAU()) > (memAddr + memSize))
+			    ? memAddr : new_addr;
+
 			size = 0;
 
 			put_count++;
@@ -750,7 +745,7 @@ public:
 		if (update_index)
 		{
 			/*u32 new_addr = a128(peek + 128 + info->auSize);
-			if (new_addr = put)
+			if (new_addr == put)
 			{
 				peek = 0;
 			}
diff --git a/rpcs3/Emu/SysCalls/lv2/SC_Lwmutex.cpp b/rpcs3/Emu/SysCalls/lv2/SC_Lwmutex.cpp
index 31fedbd349..1c9d0bd071 100644
--- a/rpcs3/Emu/SysCalls/lv2/SC_Lwmutex.cpp
+++ b/rpcs3/Emu/SysCalls/lv2/SC_Lwmutex.cpp
@@ -175,7 +175,7 @@ bool SleepQueue::invalidate(u32 tid)
 
 	if (tid) for (u32 i = 0; i < list.GetCount(); i++)
 	{
-		if (list[i] = tid)
+		if (list[i] == tid)
 		{
 			list.RemoveAt(i);
 			return true;