]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
drivers: macintosh: rack-meter: really fix bogus memsets
authorAaro Koskinen <aaro.koskinen@iki.fi>
Fri, 16 Mar 2018 20:17:28 +0000 (22:17 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 May 2018 05:52:27 +0000 (07:52 +0200)
[ 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

index 910b5b6f96b1439a5843b8b08aa81b86e6ca5e9b..eb65b6e78d57d07a8141825280dd63dfcd5058dd 100644 (file)
@@ -154,8 +154,8 @@ static void rackmeter_do_pause(struct rackmeter *rm, int pause)
                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;