diff options
author | Hans de Goede <j.w.r.degoede@hhs.nl> | 2008-04-23 07:09:12 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:14:32 -0400 |
commit | e2997a72ddfafc25bd0c8f1f52bcf41979d5a559 (patch) | |
tree | be39e1c2f946a5d3c2e82fe7a2d663f54fda11d4 /drivers/media/video/gspca/gspca.h | |
parent | 63eb9546dcb5e9dc39ab88a603dede8fdd18e717 (diff) |
V4L/DVB (8153): Subdriver pac207 added and minor changes.
pac207 added.
Check status on mutex lock.
Call back on frame dequeue.
Free the resources on last close only.
Avoid URB and ISOC errors on close.
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/gspca/gspca.h')
-rw-r--r-- | drivers/media/video/gspca/gspca.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h index 1394ab13f1f..3bfb3641cf3 100644 --- a/drivers/media/video/gspca/gspca.h +++ b/drivers/media/video/gspca/gspca.h | |||
@@ -90,17 +90,18 @@ struct ctrl { | |||
90 | /* subdriver description */ | 90 | /* subdriver description */ |
91 | struct sd_desc { | 91 | struct sd_desc { |
92 | /* information */ | 92 | /* information */ |
93 | char *name; /* sub-driver name */ | 93 | char *name; /* sub-driver name */ |
94 | /* controls */ | 94 | /* controls */ |
95 | struct ctrl *ctrls; | 95 | struct ctrl *ctrls; |
96 | int nctrls; | 96 | int nctrls; |
97 | /* operations */ | 97 | /* operations */ |
98 | cam_cf_op config; /* called on probe */ | 98 | cam_cf_op config; /* called on probe */ |
99 | cam_op open; /* called on open */ | 99 | cam_op open; /* called on open */ |
100 | cam_v_op start; /* called on stream on */ | 100 | cam_v_op start; /* called on stream on */ |
101 | cam_v_op stopN; /* called on stream off - main alt */ | 101 | cam_v_op stopN; /* called on stream off - main alt */ |
102 | cam_v_op stop0; /* called on stream off - alt 0 */ | 102 | cam_v_op stop0; /* called on stream off - alt 0 */ |
103 | cam_v_op close; /* called on close */ | 103 | cam_v_op close; /* called on close */ |
104 | cam_v_op dq_callback; /* called when a frame has been dequeued */ | ||
104 | cam_pkt_op pkt_scan; | 105 | cam_pkt_op pkt_scan; |
105 | cam_jpg_op get_jcomp; | 106 | cam_jpg_op get_jcomp; |
106 | cam_jpg_op set_jcomp; | 107 | cam_jpg_op set_jcomp; |
@@ -167,8 +168,6 @@ int gspca_dev_probe(struct usb_interface *intf, | |||
167 | const struct usb_device_id *id, | 168 | const struct usb_device_id *id, |
168 | const struct sd_desc *sd_desc, | 169 | const struct sd_desc *sd_desc, |
169 | int dev_size); | 170 | int dev_size); |
170 | int gspca_dev_init(struct gspca_dev *gspca_dev, | ||
171 | struct usb_interface *intf); | ||
172 | void gspca_disconnect(struct usb_interface *intf); | 171 | void gspca_disconnect(struct usb_interface *intf); |
173 | struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev, | 172 | struct gspca_frame *gspca_frame_add(struct gspca_dev *gspca_dev, |
174 | int packet_type, | 173 | int packet_type, |