diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2018-02-09 08:50:42 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2018-03-08 11:34:43 +0530 |
| commit | b5f208ce8c8ed7d39d34994748723c135a8deb82 (patch) | |
| tree | f0558d96fc10970e5c9b153db64d03863fbaee89 | |
| parent | e602b173b4bb6241d796a2bf1e652a97a45c4e27 (diff) | |
| download | sdw_old-topic/vkoul/sdw_remove_ml2.tar.gz | |
code optztopic/vkoul/sdw_remove_ml2
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
| -rw-r--r-- | drivers/soundwire/runtime.c | 4 | ||||
| -rw-r--r-- | drivers/soundwire/stream.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/soundwire/runtime.c b/drivers/soundwire/runtime.c index 1ff639a092abe..7b30f4712be0e 100644 --- a/drivers/soundwire/runtime.c +++ b/drivers/soundwire/runtime.c @@ -389,7 +389,7 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus, intr = true; /* Enable interrupt before Port prepare */ - if ((prep) && (intr)) { + if (prep && intr) { ret = sdw_configure_dpn_intr(s_rt->slave, p_rt->num, prep, dpn_prop->device_interrupts); if (ret < 0) @@ -447,7 +447,7 @@ static int sdw_prep_deprep_slave_ports(struct sdw_bus *bus, } /* Disable interrupt after Port de-prepare */ - if ((!prep) && (intr)) + if (!prep && intr) ret = sdw_configure_dpn_intr(s_rt->slave, p_rt->num, prep, dpn_prop->device_interrupts); diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index 11bc0be89ca22..ade3b573ed68d 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -182,9 +182,8 @@ static void sdw_release_master_stream(struct sdw_stream_runtime *stream) struct sdw_slave_runtime *s_rt, *_s_rt; list_for_each_entry_safe(s_rt, _s_rt, - &m_rt->slave_list, m_rt_node) { + &m_rt->slave_list, m_rt_node) sdw_release_slave_stream(s_rt->slave, stream); - } list_del(&m_rt->bus_node); } |