diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 19:24:02 (GMT) |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-04 19:24:02 (GMT) |
commit | db0a2901a32c44510d7d429358d017143a649a70 (patch) | |
tree | 4e4e41cf2e27aa4940f9c0711ca2a3bf7557a805 /drivers/media/video/usbvideo/ibmcam.c | |
parent | d210baf53b699fc61aa891c177b71d7082d3b957 (diff) | |
parent | 4cce1655b26a4df1e619b2aa3d2eea1b7a6e906c (diff) | |
download | linux-db0a2901a32c44510d7d429358d017143a649a70.tar.xz |
Merge branch 'fixes_stg' of ../git_old into fixes
Diffstat (limited to 'drivers/media/video/usbvideo/ibmcam.c')
-rw-r--r-- | drivers/media/video/usbvideo/ibmcam.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/usbvideo/ibmcam.c b/drivers/media/video/usbvideo/ibmcam.c index 59166b7..cc27efe 100644 --- a/drivers/media/video/usbvideo/ibmcam.c +++ b/drivers/media/video/usbvideo/ibmcam.c @@ -736,12 +736,12 @@ static enum ParseState ibmcam_model2_320x240_parse_lines( * make black color and quit the horizontal scanning loop. */ if (((frame->curline + 2) >= scanHeight) || (i >= scanLength)) { - const int j = i * V4L_BYTES_PER_PIXEL; + const int offset = i * V4L_BYTES_PER_PIXEL; #if USES_IBMCAM_PUTPIXEL /* Refresh 'f' because we don't use it much with PUTPIXEL */ - f = frame->data + (v4l_linesize * frame->curline) + j; + f = frame->data + (v4l_linesize * frame->curline) + offset; #endif - memset(f, 0, v4l_linesize - j); + memset(f, 0, v4l_linesize - offset); break; } |