aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/usbvision/usbvision-i2c.c
diff options
context:
space:
mode:
authorThierry MERLE <thierry.merle@free.fr>2006-12-04 06:31:14 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 06:05:45 -0500
commitf2242ee5474f46d87a45cd4e214b5c3aa02ff293 (patch)
tree38d7eff61756058d6bec246b672effb0f0f0c04c /drivers/media/video/usbvision/usbvision-i2c.c
parent18d8a4540caddaa9a42fb4dbc04c75c4b806278b (diff)
V4L/DVB (4927): Enhancements on usbvision driver
Enhance the buffer management of this driver + some corrections - linux list.h usage for buffer management - VIDIOC_ENUMSTD/VIDIOC_G_STD/VIDIOC_S_STD simplification (use of v4l2_video_std_construct) - create_sysfs : remove of warnings for video_device_create_file return code - make the driver compatible with 2.6.19 kernel version (remove slave_send and slave_recv in usbvision-i2c, change ctrlUrb_complete function prototype) - deactivated v4l2_read because this code was not the priority but working on it :) Signed-off-by: Thierry MERLE <thierry.merle@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-i2c.c')
-rw-r--r--drivers/media/video/usbvision/usbvision-i2c.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c
index 466e11f4584e..48afcd2aca3f 100644
--- a/drivers/media/video/usbvision/usbvision-i2c.c
+++ b/drivers/media/video/usbvision/usbvision-i2c.c
@@ -1,4 +1,4 @@
1/* 1/*
2 * I2C_ALGO_USB.C 2 * I2C_ALGO_USB.C
3 * i2c algorithm for USB-I2C Bridges 3 * i2c algorithm for USB-I2C Bridges
4 * 4 *
@@ -39,7 +39,7 @@
39#include <linux/i2c.h> 39#include <linux/i2c.h>
40#include "usbvision-i2c.h" 40#include "usbvision-i2c.h"
41 41
42static int debug_i2c_usb = 0; 42static int debug_i2c_usb = 0;
43 43
44#if defined(module_param) // Showing parameters under SYSFS 44#if defined(module_param) // Showing parameters under SYSFS
45module_param (debug_i2c_usb, int, 0444); // debug_i2c_usb mode of the device driver 45module_param (debug_i2c_usb, int, 0444); // debug_i2c_usb mode of the device driver
@@ -108,7 +108,7 @@ static inline int usb_find_address(struct i2c_adapter *i2c_adap,
108 unsigned char *add) 108 unsigned char *add)
109{ 109{
110 unsigned short flags = msg->flags; 110 unsigned short flags = msg->flags;
111 111
112 unsigned char addr; 112 unsigned char addr;
113 int ret; 113 int ret;
114 if ((flags & I2C_M_TEN)) { 114 if ((flags & I2C_M_TEN)) {
@@ -205,8 +205,6 @@ static u32 usb_func(struct i2c_adapter *adap)
205static struct i2c_algorithm i2c_usb_algo = { 205static struct i2c_algorithm i2c_usb_algo = {
206 .master_xfer = usb_xfer, 206 .master_xfer = usb_xfer,
207 .smbus_xfer = NULL, 207 .smbus_xfer = NULL,
208 .slave_send = NULL,
209 .slave_recv = NULL,
210 .algo_control = algo_control, 208 .algo_control = algo_control,
211 .functionality = usb_func, 209 .functionality = usb_func,
212}; 210};