From: Joe Perches Date: Mon, 13 Sep 2010 22:07:14 +0000 (-0300) Subject: V4L/DVB: drivers/media/video/zoran: Don't use initialized char array X-Git-Tag: MMI-PSA29.97-13-9~21911^2~360 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=634c6931637093f012df56d489e0b2f7735c235f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git V4L/DVB: drivers/media/video/zoran: Don't use initialized char array Just fill the array as necessary and terminate with 0 Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/zoran/zoran_device.c b/drivers/media/video/zoran/zoran_device.c index 6f846abee3e4..b02007e42150 100644 --- a/drivers/media/video/zoran/zoran_device.c +++ b/drivers/media/video/zoran/zoran_device.c @@ -1470,8 +1470,7 @@ zoran_irq (int irq, (zr->codec_mode == BUZ_MODE_MOTION_DECOMPRESS || zr->codec_mode == BUZ_MODE_MOTION_COMPRESS)) { if (zr36067_debug > 1 && (!zr->frame_num || zr->JPEG_error)) { - char sc[] = "0000"; - char sv[5]; + char sv[BUZ_NUM_STAT_COM + 1]; int i; printk(KERN_INFO @@ -1481,12 +1480,9 @@ zoran_irq (int irq, zr->jpg_settings.field_per_buff, zr->JPEG_missed); - strcpy(sv, sc); - for (i = 0; i < 4; i++) { - if (le32_to_cpu(zr->stat_com[i]) & 1) - sv[i] = '1'; - } - sv[4] = 0; + for (i = 0; i < BUZ_NUM_STAT_COM; i++) + sv[i] = le32_to_cpu(zr->stat_com[i]) & 1 ? '1' : '0'; + sv[BUZ_NUM_STAT_COM] = 0; printk(KERN_INFO "%s: stat_com=%s queue_state=%ld/%ld/%ld/%ld\n", ZR_DEVNAME(zr), sv,