summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/uvc/uvc_video.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-04-24 01:33:08 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-24 01:33:08 -0300
commit005392231f73c7f7781c04eebf5869c0174f503e (patch)
treea261d186361d85d130fe033cc63d575421800727 /linux/drivers/media/video/uvc/uvc_video.c
parent59964b28e0205cdf0a4465194f40867b7c7f5aa6 (diff)
parent2da45c822154d03cd7db86ac11b52385f1fac384 (diff)
downloadmediapointer-dvb-s2-005392231f73c7f7781c04eebf5869c0174f503e.tar.gz
mediapointer-dvb-s2-005392231f73c7f7781c04eebf5869c0174f503e.tar.bz2
merge: http://jusst.de/hg/v4l-dvb/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/uvc/uvc_video.c')
-rw-r--r--linux/drivers/media/video/uvc/uvc_video.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/uvc/uvc_video.c b/linux/drivers/media/video/uvc/uvc_video.c
index 82a9999b6..c5df33de9 100644
--- a/linux/drivers/media/video/uvc/uvc_video.c
+++ b/linux/drivers/media/video/uvc/uvc_video.c
@@ -746,7 +746,7 @@ static int uvc_alloc_urb_buffers(struct uvc_video_device *video,
/* Buffers are already allocated, bail out. */
if (video->urb_size)
- return 0;
+ return video->urb_size / psize;
/* Compute the number of packets. Bulk endpoints might transfer UVC
* payloads accross multiple URBs.