aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pwc/pwc.h
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2011-06-26 12:57:15 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 16:53:44 -0400
commit04613c5e600e64840e4f753bd881cd5ab96ae403 (patch)
treed253b03b6d2afc47ba795bf24aed8db44b713506 /drivers/media/video/pwc/pwc.h
parent4fba471e405f8f983085fd9f2fd9637bfc275f8f (diff)
[media] pwc: properly allocate dma-able memory for ISO buffers
Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/pwc/pwc.h')
-rw-r--r--drivers/media/video/pwc/pwc.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h
index d65cd14ef9f2..1cfb8b475a3f 100644
--- a/drivers/media/video/pwc/pwc.h
+++ b/drivers/media/video/pwc/pwc.h
@@ -128,15 +128,6 @@
128#define DEVICE_USE_CODEC3(x) ((x)>=700) 128#define DEVICE_USE_CODEC3(x) ((x)>=700)
129#define DEVICE_USE_CODEC23(x) ((x)>=675) 129#define DEVICE_USE_CODEC23(x) ((x)>=675)
130 130
131/* The following structures were based on cpia.h. Why reinvent the wheel? :-) */
132struct pwc_iso_buf
133{
134 void *data;
135 int length;
136 int read;
137 struct urb *urb;
138};
139
140/* intermediate buffers with raw data from the USB cam */ 131/* intermediate buffers with raw data from the USB cam */
141struct pwc_frame_buf 132struct pwc_frame_buf
142{ 133{
@@ -180,7 +171,7 @@ struct pwc_device
180 int cmd_len; 171 int cmd_len;
181 unsigned char cmd_buf[13]; 172 unsigned char cmd_buf[13];
182 173
183 struct pwc_iso_buf sbuf[MAX_ISO_BUFS]; 174 struct urb *urbs[MAX_ISO_BUFS];
184 char iso_init; 175 char iso_init;
185 176
186 /* videobuf2 queue and queued buffers list */ 177 /* videobuf2 queue and queued buffers list */