diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2017-09-04 13:22:07 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2017-09-04 13:22:07 +0200 |
| commit | cff17411c160fced8aaa0a4eb9c0149cf24c91e8 (patch) | |
| tree | aea92a741a71f5feaf132aafdf003d9763ed8bf6 /drivers/net | |
| parent | 0caf1df0c520325c9352149795266709e989b222 (diff) | |
| parent | cd99a4f3f43ba1b88ff0ef01a9d5564fdf824c38 (diff) | |
Merge 4.4.86 into android-4.4
Changes in 4.4.86
scsi: isci: avoid array subscript warning
ALSA: au88x0: Fix zero clear of stream->resources
btrfs: remove duplicate const specifier
i2c: jz4780: drop superfluous init
gcov: add support for gcc version >= 6
gcov: support GCC 7.1
lightnvm: initialize ppa_addr in dev_to_generic_addr()
p54: memset(0) whole array
lpfc: Fix Device discovery failures during switch reboot test.
arm64: mm: abort uaccess retries upon fatal signal
x86/io: Add "memory" clobber to insb/insw/insl/outsb/outsw/outsl
arm64: fpsimd: Prevent registers leaking across exec
scsi: sg: protect accesses to 'reserved' page array
scsi: sg: reset 'res_in_use' after unlinking reserved array
drm/i915: fix compiler warning in drivers/gpu/drm/i915/intel_uncore.c
Linux 4.4.86
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/p54/fwio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c index 257a9eadd595..4ac6764f4897 100644 --- a/drivers/net/wireless/p54/fwio.c +++ b/drivers/net/wireless/p54/fwio.c @@ -488,7 +488,7 @@ int p54_scan(struct p54_common *priv, u16 mode, u16 dwell) entry += sizeof(__le16); chan->pa_points_per_curve = 8; - memset(chan->curve_data, 0, sizeof(*chan->curve_data)); + memset(chan->curve_data, 0, sizeof(chan->curve_data)); memcpy(chan->curve_data, entry, sizeof(struct p54_pa_curve_data_sample) * min((u8)8, curve_data->points_per_channel)); |