From 7d682a18231cef7a2c909511e9fca206997dc600 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 13 Sep 2010 19:07:14 -0300 Subject: [PATCH] --- yaml --- r: 219179 b: refs/heads/master c: 634c6931637093f012df56d489e0b2f7735c235f h: refs/heads/master i: 219177: a1aa559cfb9b3a61e4853f0beb185be22adc1cc0 219175: fd21477aa5a3f5a518e99c71a7b19c8ea6b8363d v: v3 --- [refs] | 2 +- trunk/drivers/media/video/zoran/zoran_device.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index efa217b7309f..b10609027cf8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5cac1f665fd18c75c9914ecd3fe808cebfe639f0 +refs/heads/master: 634c6931637093f012df56d489e0b2f7735c235f diff --git a/trunk/drivers/media/video/zoran/zoran_device.c b/trunk/drivers/media/video/zoran/zoran_device.c index 6f846abee3e4..b02007e42150 100644 --- a/trunk/drivers/media/video/zoran/zoran_device.c +++ b/trunk/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,