diff options
Diffstat (limited to 'drivers/media/video/w9968cf.c')
| -rw-r--r-- | drivers/media/video/w9968cf.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c index 8f31613b990..9e7f3e685d7 100644 --- a/drivers/media/video/w9968cf.c +++ b/drivers/media/video/w9968cf.c @@ -42,7 +42,6 @@ #include <asm/page.h> #include <asm/uaccess.h> #include <linux/page-flags.h> -#include <linux/moduleparam.h> #include "w9968cf.h" #include "w9968cf_decoder.h" @@ -445,8 +444,6 @@ static int w9968cf_i2c_smbus_xfer(struct i2c_adapter*, u16 addr, static u32 w9968cf_i2c_func(struct i2c_adapter*); static int w9968cf_i2c_attach_inform(struct i2c_client*); static int w9968cf_i2c_detach_inform(struct i2c_client*); -static int w9968cf_i2c_control(struct i2c_adapter*, unsigned int cmd, - unsigned long arg); /* Memory management */ static void* rvmalloc(unsigned long size); @@ -1544,21 +1541,12 @@ static int w9968cf_i2c_detach_inform(struct i2c_client* client) } -static int -w9968cf_i2c_control(struct i2c_adapter* adapter, unsigned int cmd, - unsigned long arg) -{ - return 0; -} - - static int w9968cf_i2c_init(struct w9968cf_device* cam) { int err = 0; static struct i2c_algorithm algo = { .smbus_xfer = w9968cf_i2c_smbus_xfer, - .algo_control = w9968cf_i2c_control, .functionality = w9968cf_i2c_func, }; @@ -2680,7 +2668,7 @@ static int w9968cf_open(struct inode* inode, struct file* filp) /* This the only safe way to prevent race conditions with disconnect */ if (!down_read_trylock(&w9968cf_disconnect)) - return -ERESTARTSYS; + return -EAGAIN; cam = (struct w9968cf_device*)video_get_drvdata(video_devdata(filp)); |