| From foo@baz Sun May 27 17:33:38 CEST 2018 |
| From: Aaro Koskinen <aaro.koskinen@iki.fi> |
| Date: Fri, 16 Mar 2018 22:17:28 +0200 |
| Subject: drivers: macintosh: rack-meter: really fix bogus memsets |
| |
| From: Aaro Koskinen <aaro.koskinen@iki.fi> |
| |
| [ Upstream commit e283655b5abe26462d53d5196f186c5e8863af3b ] |
| |
| We should zero an array using sizeof instead of number of elements. |
| |
| Fixes the following compiler (GCC 7.3.0) warnings: |
| |
| drivers/macintosh/rack-meter.c: In function 'rackmeter_do_pause': |
| drivers/macintosh/rack-meter.c:157:2: warning: 'memset' used with length equal to number of elements without multiplication by element size [-Wmemset-elt-size] |
| drivers/macintosh/rack-meter.c:158:2: warning: 'memset' used with length equal to number of elements without multiplication by element size [-Wmemset-elt-size] |
| |
| Fixes: 4f7bef7a9f69 ("drivers: macintosh: rack-meter: fix bogus memsets") |
| Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> |
| Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/macintosh/rack-meter.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/macintosh/rack-meter.c |
| +++ b/drivers/macintosh/rack-meter.c |
| @@ -154,8 +154,8 @@ static void rackmeter_do_pause(struct ra |
| DBDMA_DO_STOP(rm->dma_regs); |
| return; |
| } |
| - memset(rdma->buf1, 0, ARRAY_SIZE(rdma->buf1)); |
| - memset(rdma->buf2, 0, ARRAY_SIZE(rdma->buf2)); |
| + memset(rdma->buf1, 0, sizeof(rdma->buf1)); |
| + memset(rdma->buf2, 0, sizeof(rdma->buf2)); |
| |
| rm->dma_buf_v->mark = 0; |
| |
