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

Commit bc45cf24 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

drivers: macintosh: rack-meter: really fix bogus memsets 



[ 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: 4f7bef7a ("drivers: macintosh: rack-meter: fix bogus memsets")
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2298423

drivers/macintosh/rack-meter.c

+2 −2
Original line number Diff line number Diff line
@@ -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;