diff --git a/[refs] b/[refs] index 9b0e79840cb3..9741d671b54b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d7aa80207babe694b316a48200b096cf0336ecb3 +refs/heads/master: ea8df7e09d2226c321c234a8f736fdb167a046cb diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c index 4e6cc612a994..6049a2278190 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-video.c +++ b/trunk/drivers/media/video/em28xx/em28xx-video.c @@ -197,7 +197,7 @@ static void em28xx_copy_video(struct em28xx *dev, lencopy = lencopy > remain ? remain : lencopy; if((char*)startwrite + lencopy > (char*)outp + buf->vb.size) { - em28xx_isocdbg("Overflow of %i bytes past buffer end (1)\n", + em28xx_isocdbg("Overflow of %zi bytes past buffer end (1)\n", ((char*)startwrite + lencopy) - ((char*)outp + buf->vb.size)); lencopy = remain = (char*)outp + buf->vb.size - (char*)startwrite; } @@ -217,7 +217,7 @@ static void em28xx_copy_video(struct em28xx *dev, BUG_ON(lencopy <= 0); if((char*)startwrite + lencopy > (char*)outp + buf->vb.size) { - em28xx_isocdbg("Overflow of %i bytes past buffer end (2)\n", + em28xx_isocdbg("Overflow of %zi bytes past buffer end (2)\n", ((char*)startwrite + lencopy) - ((char*)outp + buf->vb.size)); lencopy = remain = (char*)outp + buf->vb.size - (char*)startwrite; }