diff options
| author | Frank Schaefer <fschaefer.oss@googlemail.com> | 2012-11-08 17:11:37 (GMT) |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-22 19:56:49 (GMT) |
| commit | 74209dc06a7c27401de637cc371f54920d628ba8 (patch) | |
| tree | 3ae3e8943d802733f07f603055d25d9b8f1a014d /drivers/media/usb/em28xx/em28xx.h | |
| parent | f0fa9936f577597dabd4a0140095bb3b02988814 (diff) | |
| download | linux-fsl-qoriq-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.h')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h index e062a27..17310e6 100644 --- a/drivers/media/usb/em28xx/em28xx.h +++ b/drivers/media/usb/em28xx/em28xx.h @@ -220,19 +220,19 @@ struct em28xx_usb_bufs { char **transfer_buffer; }; -struct em28xx_usb_isoc_ctl { - /* isoc transfer buffers for analog mode */ +struct em28xx_usb_ctl { + /* isoc/bulk transfer buffers for analog mode */ struct em28xx_usb_bufs analog_bufs; - /* isoc transfer buffers for digital mode */ + /* isoc/bulk transfer buffers for digital mode */ struct em28xx_usb_bufs digital_bufs; /* Stores already requested buffers */ struct em28xx_buffer *vid_buf; struct em28xx_buffer *vbi_buf; - /* isoc urb callback */ - int (*isoc_copy) (struct em28xx *dev, struct urb *urb); + /* copy data from URB */ + int (*urb_data_copy) (struct em28xx *dev, struct urb *urb); }; @@ -582,7 +582,7 @@ struct em28xx { /* Isoc control struct */ struct em28xx_dmaqueue vidq; struct em28xx_dmaqueue vbiq; - struct em28xx_usb_isoc_ctl isoc_ctl; + struct em28xx_usb_ctl usb_ctl; spinlock_t slock; /* usb transfer */ |