summaryrefslogtreecommitdiff
path: root/drivers/media/usb/em28xx/em28xx-vbi.c
diff options
context:
space:
mode:
authorFrank Schaefer <fschaefer.oss@googlemail.com>2012-11-08 14:11:37 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-12-22 17:56:49 -0200
commit74209dc06a7c27401de637cc371f54920d628ba8 (patch)
tree3ae3e8943d802733f07f603055d25d9b8f1a014d /drivers/media/usb/em28xx/em28xx-vbi.c
parentf0fa9936f577597dabd4a0140095bb3b02988814 (diff)
downloadlinux-74209dc06a7c27401de637cc371f54920d628ba8.tar.gz
linux-74209dc06a7c27401de637cc371f54920d628ba8.tar.xz
[media] em28xx: rename struct em28xx_usb_isoc_ctl to em28xx_usb_ctl
Also rename the corresponding field isoc_ctl in struct em28xx to usb_ctl. We will use this struct for USB bulk transfers, too. Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-vbi.c')
-rw-r--r--drivers/media/usb/em28xx/em28xx-vbi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-vbi.c b/drivers/media/usb/em28xx/em28xx-vbi.c
index 2b4c9cba2d67..d74713bd1d18 100644
--- a/drivers/media/usb/em28xx/em28xx-vbi.c
+++ b/drivers/media/usb/em28xx/em28xx-vbi.c
@@ -60,8 +60,8 @@ free_buffer(struct videobuf_queue *vq, struct em28xx_buffer *buf)
VIDEOBUF_ACTIVE, it won't be, though.
*/
spin_lock_irqsave(&dev->slock, flags);
- if (dev->isoc_ctl.vbi_buf == buf)
- dev->isoc_ctl.vbi_buf = NULL;
+ if (dev->usb_ctl.vbi_buf == buf)
+ dev->usb_ctl.vbi_buf = NULL;
spin_unlock_irqrestore(&dev->slock, flags);
videobuf_vmalloc_free(&buf->vb);