diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-08 10:34:10 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-08 10:34:10 -0500 |
| commit | 155ec9e63da962bf26ffc65a4088c6cc935f28db (patch) | |
| tree | 1933dcb638ff78849a2db9d24c7c3443564e4867 /drivers/media/video/zr36050.c | |
| parent | 8e2cc1af9fa067fe49c639ee5e5e07c96a54fe49 (diff) | |
| parent | 8a59822f68996c1f525a8ed87447a4dbc27ada0b (diff) | |
Merge branch 'work-fixes'
Diffstat (limited to 'drivers/media/video/zr36050.c')
| -rw-r--r-- | drivers/media/video/zr36050.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/zr36050.c b/drivers/media/video/zr36050.c index bd0cd28543ca..6699725be605 100644 --- a/drivers/media/video/zr36050.c +++ b/drivers/media/video/zr36050.c | |||
| @@ -159,7 +159,7 @@ zr36050_wait_end (struct zr36050 *ptr) | |||
| 159 | 159 | ||
| 160 | while (!(zr36050_read_status1(ptr) & 0x4)) { | 160 | while (!(zr36050_read_status1(ptr) & 0x4)) { |
| 161 | udelay(1); | 161 | udelay(1); |
| 162 | if (i++ > 200000) { // 200ms, there is for shure something wrong!!! | 162 | if (i++ > 200000) { // 200ms, there is for sure something wrong!!! |
| 163 | dprintk(1, | 163 | dprintk(1, |
| 164 | "%s: timout at wait_end (last status: 0x%02x)\n", | 164 | "%s: timout at wait_end (last status: 0x%02x)\n", |
| 165 | ptr->name, ptr->status1); | 165 | ptr->name, ptr->status1); |