diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-29 13:42:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-29 13:42:37 +0200 |
| commit | e21107aa6bf32a90f856c96d77806bf42eb8f238 (patch) | |
| tree | cf9579ba07f8853e696266e77b36d41fbaf24ce2 /drivers/soundwire/stream.c | |
| parent | c0286f568069198484552c39fd2714153b2b16ec (diff) | |
| parent | 4abbd783d126cabfc20d1b8d50b1d5026b5cba09 (diff) | |
Merge tag 'soundwire-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next
Vinod writes:
soundwire updates for v5.2-rc1
This round saw interest from Intel, Linaro and Cadence in
Soundwire. More patches are in pipeline (maybe next cycle)
- removal of useless initialzation in core
- couple of header and kcalloc inversion fixes on Intel driver
* tag 'soundwire-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
soundwire: intel: fix implicit header use of module.h/export.h
soundwire: stream: remove useless initialization of local variable
soundwire: remove useless initializations
soundwire: intel: fix inversion in devm_kcalloc parameters
Diffstat (limited to 'drivers/soundwire/stream.c')
| -rw-r--r-- | drivers/soundwire/stream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c index bd879b1a76c8..63b162feecfc 100644 --- a/drivers/soundwire/stream.c +++ b/drivers/soundwire/stream.c @@ -327,7 +327,7 @@ static int sdw_enable_disable_master_ports(struct sdw_master_runtime *m_rt, struct sdw_transport_params *t_params = &p_rt->transport_params; struct sdw_bus *bus = m_rt->bus; struct sdw_enable_ch enable_ch; - int ret = 0; + int ret; enable_ch.port_num = p_rt->num; enable_ch.ch_mask = p_rt->ch_mask; |