diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 22:22:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-13 22:22:22 -0500 |
commit | d8c532c40721f7507896d202b8cae3b3642d2b0d (patch) | |
tree | 42b1ce76671eb85324281ed93491432f4523f983 /drivers/media/usb/em28xx/em28xx-cards.c | |
parent | e777d192ffb9f2929d547a2f8a5f65b7db7a9552 (diff) | |
parent | 77c53d0b56264a8fc5844e087ad15fffe20c299d (diff) |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab:
- Missing MAINTAINERS entries were added for several drivers
- Adds V4L2 support for DMABUF handling, allowing zero-copy buffer
sharing between V4L2 devices and GPU
- Got rid of all warnings when compiling with W=1 on x86
- Add a new driver for Exynos hardware (s3c-camif)
- Several bug fixes, cleanups and driver improvements
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (243 commits)
[media] omap3isp: Replace cpu_is_omap3630() with ISP revision check
[media] omap3isp: Prepare/unprepare clocks before/after enable/disable
[media] omap3isp: preview: Add support for 8-bit formats at the sink pad
[media] omap3isp: Replace printk with dev_*
[media] omap3isp: Find source pad from external entity
[media] omap3isp: Configure CSI-2 phy based on platform data
[media] omap3isp: Add PHY routing configuration
[media] omap3isp: Add CSI configuration registers from control block to ISP resources
[media] omap3isp: Remove unneeded module memory address definitions
[media] omap3isp: Use monotonic timestamps for statistics buffers
[media] uvcvideo: Fix control value clamping for unsigned integer controls
[media] uvcvideo: Mark first output terminal as default video node
[media] uvcvideo: Add VIDIOC_[GS]_PRIORITY support
[media] uvcvideo: Return -ENOTTY for unsupported ioctls
[media] uvcvideo: Set device_caps in VIDIOC_QUERYCAP
[media] uvcvideo: Don't fail when an unsupported format is requested
[media] uvcvideo: Return -EACCES when trying to access a read/write-only control
[media] uvcvideo: Set error_idx properly for extended controls API failures
[media] rtl28xxu: add NOXON DAB/DAB+ USB dongle rev 2
[media] fc2580: write some registers conditionally
...
Diffstat (limited to 'drivers/media/usb/em28xx/em28xx-cards.c')
-rw-r--r-- | drivers/media/usb/em28xx/em28xx-cards.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index 16a84f9f46d8..619bffbab3bc 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c | |||
@@ -1979,6 +1979,15 @@ struct em28xx_board em28xx_boards[] = { | |||
1979 | EM28XX_I2C_CLK_WAIT_ENABLE | | 1979 | EM28XX_I2C_CLK_WAIT_ENABLE | |
1980 | EM28XX_I2C_FREQ_400_KHZ, | 1980 | EM28XX_I2C_FREQ_400_KHZ, |
1981 | }, | 1981 | }, |
1982 | [EM2884_BOARD_TERRATEC_HTC_USB_XS] = { | ||
1983 | .name = "Terratec Cinergy HTC USB XS", | ||
1984 | .has_dvb = 1, | ||
1985 | .ir_codes = RC_MAP_NEC_TERRATEC_CINERGY_XS, | ||
1986 | .tuner_type = TUNER_ABSENT, | ||
1987 | .i2c_speed = EM2874_I2C_SECONDARY_BUS_SELECT | | ||
1988 | EM28XX_I2C_CLK_WAIT_ENABLE | | ||
1989 | EM28XX_I2C_FREQ_400_KHZ, | ||
1990 | }, | ||
1982 | }; | 1991 | }; |
1983 | const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards); | 1992 | const unsigned int em28xx_bcount = ARRAY_SIZE(em28xx_boards); |
1984 | 1993 | ||
@@ -2057,9 +2066,9 @@ struct usb_device_id em28xx_id_table[] = { | |||
2057 | { USB_DEVICE(0x0ccd, 0x0043), | 2066 | { USB_DEVICE(0x0ccd, 0x0043), |
2058 | .driver_info = EM2870_BOARD_TERRATEC_XS }, | 2067 | .driver_info = EM2870_BOARD_TERRATEC_XS }, |
2059 | { USB_DEVICE(0x0ccd, 0x008e), /* Cinergy HTC USB XS Rev. 1 */ | 2068 | { USB_DEVICE(0x0ccd, 0x008e), /* Cinergy HTC USB XS Rev. 1 */ |
2060 | .driver_info = EM2884_BOARD_TERRATEC_H5 }, | 2069 | .driver_info = EM2884_BOARD_TERRATEC_HTC_USB_XS }, |
2061 | { USB_DEVICE(0x0ccd, 0x00ac), /* Cinergy HTC USB XS Rev. 2 */ | 2070 | { USB_DEVICE(0x0ccd, 0x00ac), /* Cinergy HTC USB XS Rev. 2 */ |
2062 | .driver_info = EM2884_BOARD_TERRATEC_H5 }, | 2071 | .driver_info = EM2884_BOARD_TERRATEC_HTC_USB_XS }, |
2063 | { USB_DEVICE(0x0ccd, 0x10a2), /* H5 Rev. 1 */ | 2072 | { USB_DEVICE(0x0ccd, 0x10a2), /* H5 Rev. 1 */ |
2064 | .driver_info = EM2884_BOARD_TERRATEC_H5 }, | 2073 | .driver_info = EM2884_BOARD_TERRATEC_H5 }, |
2065 | { USB_DEVICE(0x0ccd, 0x10ad), /* H5 Rev. 2 */ | 2074 | { USB_DEVICE(0x0ccd, 0x10ad), /* H5 Rev. 2 */ |
@@ -3297,7 +3306,7 @@ static int em28xx_usb_probe(struct usb_interface *interface, | |||
3297 | 3306 | ||
3298 | dev->num_alt = interface->num_altsetting; | 3307 | dev->num_alt = interface->num_altsetting; |
3299 | 3308 | ||
3300 | if ((card[nr] >= 0) && (card[nr] < em28xx_bcount)) | 3309 | if ((unsigned)card[nr] < em28xx_bcount) |
3301 | dev->model = card[nr]; | 3310 | dev->model = card[nr]; |
3302 | 3311 | ||
3303 | /* save our data pointer in this interface device */ | 3312 | /* save our data pointer in this interface device */ |