| Message ID | 20161014092309.24113-1-jslaby@suse.cz (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 6f17581788206444cbbcdbc107498f85e9765e3d |
| Delegated to: | Kalle Valo |
| Headers | show |
On Friday, October 14, 2016 11:23:09 AM CEST Jiri Slaby wrote: > 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: Jiri Slaby <jslaby@suse.cz> > Cc: Christian Lamparter <chunkeey@googlemail.com> > Cc: Kalle Valo <kvalo@codeaurora.org> > Cc: linux-wireless@vger.kernel.org > Cc: netdev@vger.kernel.org Acked-by: Christian Lamparter <chunkeey@googlemail.com> > --- > drivers/net/wireless/intersil/p54/fwio.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/intersil/p54/fwio.c b/drivers/net/wireless/intersil/p54/fwio.c > index 257a9eadd595..4ac6764f4897 100644 > --- a/drivers/net/wireless/intersil/p54/fwio.c > +++ b/drivers/net/wireless/intersil/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)); >
Jiri Slaby <jslaby@suse.cz> wrote: > 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: Jiri Slaby <jslaby@suse.cz> > Cc: Christian Lamparter <chunkeey@googlemail.com> > Cc: Kalle Valo <kvalo@codeaurora.org> > Cc: linux-wireless@vger.kernel.org > Cc: netdev@vger.kernel.org > Acked-by: Christian Lamparter <chunkeey@googlemail.com> Patch applied to wireless-drivers-next.git, thanks. 6f1758178820 p54: memset(0) whole array
diff --git a/drivers/net/wireless/intersil/p54/fwio.c b/drivers/net/wireless/intersil/p54/fwio.c index 257a9eadd595..4ac6764f4897 100644 --- a/drivers/net/wireless/intersil/p54/fwio.c +++ b/drivers/net/wireless/intersil/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));
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: Jiri Slaby <jslaby@suse.cz> Cc: Christian Lamparter <chunkeey@googlemail.com> Cc: Kalle Valo <kvalo@codeaurora.org> Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org --- drivers/net/wireless/intersil/p54/fwio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)