diff options
author | Luca Risolia <luca.risolia@studio.unibo.it> | 2006-02-25 01:50:47 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-20 17:49:59 -0500 |
commit | 2ffab02fea5880da284dc5511479b25a796a8dee (patch) | |
tree | b94481244ae823598d06cd72472b9c76e9639bd1 /drivers/usb/media/sn9c102_tas5130d1b.c | |
parent | 7039f4224d4e40b06308d5c1a97427af1a142459 (diff) |
[PATCH] USB: SN9C10x driver updates
SN9C10x driver updates.
Changes: + new, - removed, * cleanup, @ bugfix
@ Fix stream_interrupt()
@ Fix vidioc_enum_input() and split vidioc_gs_input()
@ Need usb_get|put_dev() when disconnecting, if the device is open
* Use wait_event_interruptible_timeout() instead of wait_event_interruptible()
when waiting for video frames
* replace wake_up_interruptible(&wait_stream) with wake_up(&wait_stream)
* Cleanups and updates in the documentation
+ Use per-device sensor structures
+ Add support for PAS202BCA image sensors
+ Add frame_timeout module parameter
Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/media/sn9c102_tas5130d1b.c')
-rw-r--r-- | drivers/usb/media/sn9c102_tas5130d1b.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/usb/media/sn9c102_tas5130d1b.c b/drivers/usb/media/sn9c102_tas5130d1b.c index a0728f0ae00c..c7b339740bbf 100644 --- a/drivers/usb/media/sn9c102_tas5130d1b.c +++ b/drivers/usb/media/sn9c102_tas5130d1b.c | |||
@@ -153,13 +153,17 @@ static struct sn9c102_sensor tas5130d1b = { | |||
153 | 153 | ||
154 | int sn9c102_probe_tas5130d1b(struct sn9c102_device* cam) | 154 | int sn9c102_probe_tas5130d1b(struct sn9c102_device* cam) |
155 | { | 155 | { |
156 | /* This sensor has no identifiers, so let's attach it anyway */ | 156 | const struct usb_device_id tas5130d1b_id_table[] = { |
157 | sn9c102_attach_sensor(cam, &tas5130d1b); | 157 | { USB_DEVICE(0x0c45, 0x6025), }, |
158 | { USB_DEVICE(0x0c45, 0x60aa), }, | ||
159 | { } | ||
160 | }; | ||
158 | 161 | ||
159 | /* Sensor detection is based on USB pid/vid */ | 162 | /* Sensor detection is based on USB pid/vid */ |
160 | if (le16_to_cpu(tas5130d1b.usbdev->descriptor.idProduct) != 0x6025 && | 163 | if (!sn9c102_match_id(cam, tas5130d1b_id_table)) |
161 | le16_to_cpu(tas5130d1b.usbdev->descriptor.idProduct) != 0x60aa) | ||
162 | return -ENODEV; | 164 | return -ENODEV; |
163 | 165 | ||
166 | sn9c102_attach_sensor(cam, &tas5130d1b); | ||
167 | |||
164 | return 0; | 168 | return 0; |
165 | } | 169 | } |