]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: em28xx: fix two smatch warnings
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Sun, 3 Nov 2019 11:23:35 +0000 (12:23 +0100)
committerMauro Carvalho Chehab <mchehab@kernel.org>
Fri, 8 Nov 2019 06:27:14 +0000 (07:27 +0100)
Use sizeof instead of ARRAY_SIZE to fix this smatch warning:

drivers/media/usb/em28xx/em28xx-i2c.c:952 em28xx_do_i2c_scan() warn: calling memset(x, y, ARRAY_SIZE());

Do the same for the em28xx_hash_mem() call in the same function.
smatch didn't pick that up, but there too it should use sizeof instead
of ARRAY_SIZE.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
drivers/media/usb/em28xx/em28xx-i2c.c

index a3155ec196cc8ea38c64e0ef7c45c38808581324..592b98b3643a2b8bf905b465a1978d9a39a92469 100644 (file)
@@ -949,7 +949,7 @@ void em28xx_do_i2c_scan(struct em28xx *dev, unsigned int bus)
        unsigned char buf;
        int i, rc;
 
-       memset(i2c_devicelist, 0, ARRAY_SIZE(i2c_devicelist));
+       memset(i2c_devicelist, 0, sizeof(i2c_devicelist));
 
        for (i = 0; i < ARRAY_SIZE(i2c_devs); i++) {
                dev->i2c_client[bus].addr = i;
@@ -964,7 +964,7 @@ void em28xx_do_i2c_scan(struct em28xx *dev, unsigned int bus)
 
        if (bus == dev->def_i2c_bus)
                dev->i2c_hash = em28xx_hash_mem(i2c_devicelist,
-                                               ARRAY_SIZE(i2c_devicelist), 32);
+                                               sizeof(i2c_devicelist), 32);
 }
 
 /*