Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 752cc3c3 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

p54: memset(0) whole array 



commit 6f17581788206444cbbcdbc107498f85e9765e3d upstream.

gcc 7 complains:
drivers/net/wireless/intersil/p54/fwio.c: In function 'p54_scan':
drivers/net/wireless/intersil/p54/fwio.c:491:4: warning: 'memset' used with length equal to number of elements without multiplication by element size [-Wmemset-elt-size]

Fix that by passing the correct size to memset.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Christian Lamparter <chunkeey@googlemail.com>
Cc: Kalle Valo <kvalo@codeaurora.org>
Acked-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a7049cdd

drivers/net/wireless/p54/fwio.c

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,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));