diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2018-05-12 10:44:00 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-05-28 15:57:17 -0400 |
| commit | 1f5965c4dfd7665f2914a1f1095dcc6020656b04 (patch) | |
| tree | 531462341750f55ef66498336b08a07c5b9de454 /drivers/media/usb/gspca/m5602/m5602_core.c | |
| parent | 90b2da89a083e1395cb322521a42397c49ae4500 (diff) | |
| download | linux-stable-1f5965c4dfd7665f2914a1f1095dcc6020656b04.tar.gz linux-stable-1f5965c4dfd7665f2914a1f1095dcc6020656b04.tar.bz2 linux-stable-1f5965c4dfd7665f2914a1f1095dcc6020656b04.zip | |
media: gspca: convert to vb2
The gspca core has its own buffere implementation. Use the
core VB 2 instead.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/usb/gspca/m5602/m5602_core.c')
| -rw-r--r-- | drivers/media/usb/gspca/m5602/m5602_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/gspca/m5602/m5602_core.c b/drivers/media/usb/gspca/m5602/m5602_core.c index b83ec4285a0b..30b7cf1feedd 100644 --- a/drivers/media/usb/gspca/m5602/m5602_core.c +++ b/drivers/media/usb/gspca/m5602/m5602_core.c @@ -342,7 +342,7 @@ static void m5602_urb_complete(struct gspca_dev *gspca_dev, data += 4; len -= 4; - if (cur_frame_len + len <= gspca_dev->frsz) { + if (cur_frame_len + len <= gspca_dev->pixfmt.sizeimage) { gspca_dbg(gspca_dev, D_FRAM, "Continuing frame %d copying %d bytes\n", sd->frame_count, len); @@ -351,7 +351,7 @@ static void m5602_urb_complete(struct gspca_dev *gspca_dev, } else { /* Add the remaining data up to frame size */ gspca_frame_add(gspca_dev, INTER_PACKET, data, - gspca_dev->frsz - cur_frame_len); + gspca_dev->pixfmt.sizeimage - cur_frame_len); } } } |