diff options
author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 21:18:01 +0100 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 21:18:01 +0100 |
commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
tree | b027b5f3429d416b3da5b9195024007dab062a5e /drivers/media/video/zr36050.c | |
parent | [SCSI] drivers/base/bus.c - export reprobe (diff) | |
parent | [PATCH] Plug kdump shutdown race window (diff) | |
download | linux-f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d.tar.xz linux-f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d.zip |
Merge ../linux-2.6
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) while (!(zr36050_read_status1(ptr) & 0x4)) { udelay(1); - if (i++ > 200000) { // 200ms, there is for shure something wrong!!! + if (i++ > 200000) { // 200ms, there is for sure something wrong!!! dprintk(1, "%s: timout at wait_end (last status: 0x%02x)\n", ptr->name, ptr->status1); |