diff options
author | Jean-François Moine <moinejf@free.fr> | 2010-07-14 05:30:18 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 15:43:06 -0400 |
commit | 35680baa6822df98a6ed602e2380aa0a04e18b07 (patch) | |
tree | ee4ebc67f847f67ebd068248187f62958dcb19ab /drivers/media/video/gspca/gspca.h | |
parent | c4dc692ce6212f4513c39dfcde725aab438a2940 (diff) |
V4L/DVB: gspca - main: Handle the audio device
When there is an audio device, use a lower alternate setting.
This patch does not fix correctly all audio and bandwidth problems.
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/gspca.h')
-rw-r--r-- | drivers/media/video/gspca/gspca.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h index 17e55580631e..b749c36d9f7e 100644 --- a/drivers/media/video/gspca/gspca.h +++ b/drivers/media/video/gspca/gspca.h | |||
@@ -198,6 +198,7 @@ struct gspca_dev { | |||
198 | struct mutex read_lock; /* read protection */ | 198 | struct mutex read_lock; /* read protection */ |
199 | struct mutex queue_lock; /* ISOC queue protection */ | 199 | struct mutex queue_lock; /* ISOC queue protection */ |
200 | int usb_err; /* USB error - protected by usb_lock */ | 200 | int usb_err; /* USB error - protected by usb_lock */ |
201 | u16 pkt_size; /* ISOC packet size */ | ||
201 | #ifdef CONFIG_PM | 202 | #ifdef CONFIG_PM |
202 | char frozen; /* suspend - resume */ | 203 | char frozen; /* suspend - resume */ |
203 | #endif | 204 | #endif |
@@ -208,7 +209,7 @@ struct gspca_dev { | |||
208 | __u8 iface; /* USB interface number */ | 209 | __u8 iface; /* USB interface number */ |
209 | __u8 alt; /* USB alternate setting */ | 210 | __u8 alt; /* USB alternate setting */ |
210 | __u8 nbalt; /* number of USB alternate settings */ | 211 | __u8 nbalt; /* number of USB alternate settings */ |
211 | u16 pkt_size; /* ISOC packet size */ | 212 | u8 audio; /* presence of audio device */ |
212 | }; | 213 | }; |
213 | 214 | ||
214 | int gspca_dev_probe(struct usb_interface *intf, | 215 | int gspca_dev_probe(struct usb_interface *intf, |