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/intel.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/intel.c')
| -rw-r--r-- | drivers/soundwire/intel.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c index fd8d034cfec1..70ca27ccad85 100644 --- a/drivers/soundwire/intel.c +++ b/drivers/soundwire/intel.c @@ -7,6 +7,7 @@ #include <linux/acpi.h> #include <linux/delay.h> +#include <linux/module.h> #include <linux/interrupt.h> #include <linux/platform_device.h> #include <sound/pcm_params.h> @@ -796,8 +797,8 @@ static int intel_prop_read(struct sdw_bus *bus) /* BIOS is not giving some values correctly. So, lets override them */ bus->prop.num_freq = 1; - bus->prop.freq = devm_kcalloc(bus->dev, sizeof(*bus->prop.freq), - bus->prop.num_freq, GFP_KERNEL); + bus->prop.freq = devm_kcalloc(bus->dev, bus->prop.num_freq, + sizeof(*bus->prop.freq), GFP_KERNEL); if (!bus->prop.freq) return -ENOMEM; |