Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219179
b: refs/heads/master
c: 634c693
h: refs/heads/master
i:
  219177: a1aa559
  219175: fd21477
v: v3
  • Loading branch information
Joe Perches authored and Mauro Carvalho Chehab committed Oct 21, 2010
1 parent e423ba1 commit 7d682a1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5cac1f665fd18c75c9914ecd3fe808cebfe639f0
refs/heads/master: 634c6931637093f012df56d489e0b2f7735c235f
12 changes: 4 additions & 8 deletions trunk/drivers/media/video/zoran/zoran_device.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down

0 comments on commit 7d682a1

Please sign in to comment.