1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index d01060dbee96..1d5294b8783b 100644
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -814,7 +814,8 @@ static int do_bank_switch(struct sdw_stream_runtime *stream)
                         goto error;
                 }
 
-                mutex_unlock(&bus->msg_lock);
+                if (bus->multi_link)
+                        mutex_unlock(&bus->msg_lock);
         }
 
         return ret;
@@ -1406,9 +1407,7 @@ struct sdw_dpn_prop *sdw_get_slave_dpn_prop(struct sdw_slave *slave,
         }
 
         for (i = 0; i < num_ports; i++) {
-                dpn_prop = &dpn_prop[i];
-
-                if (dpn_prop->num == port_num)
+                if (dpn_prop[i].num == port_num)
                         return &dpn_prop[i];
         }