diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-23 16:54:56 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-23 16:54:56 -0200 |
| commit | 2d65658078459d35572e637c8cb1b6fc3826f12a (patch) | |
| tree | e18d3f1e0e68c693a727e429934e42af169a2853 /linux/drivers/media/video/w9968cf.c | |
| parent | b64c80be829fbeb8b936ca6d61a59013d8ad2bba (diff) | |
| parent | cc88074b4da7cb25b8c2bc93f41434cfc1763924 (diff) | |
| download | mediapointer-dvb-s2-2d65658078459d35572e637c8cb1b6fc3826f12a.tar.gz mediapointer-dvb-s2-2d65658078459d35572e637c8cb1b6fc3826f12a.tar.bz2 | |
merge: http://linuxtv.org/hg/~mrechberger/v4l-dvb-cx88
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/w9968cf.c')
| -rw-r--r-- | linux/drivers/media/video/w9968cf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/w9968cf.c b/linux/drivers/media/video/w9968cf.c index c165239f4..f27f8f152 100644 --- a/linux/drivers/media/video/w9968cf.c +++ b/linux/drivers/media/video/w9968cf.c @@ -399,7 +399,7 @@ MODULE_PARM_DESC(specific_debug, ****************************************************************************/ /* Video4linux interface */ -static struct file_operations w9968cf_fops; +static const struct file_operations w9968cf_fops; static int w9968cf_open(struct inode*, struct file*); static int w9968cf_release(struct inode*, struct file*); static int w9968cf_mmap(struct file*, struct vm_area_struct*); @@ -1581,6 +1581,7 @@ static int w9968cf_i2c_init(struct w9968cf_device* cam) memcpy(&cam->i2c_adapter, &adap, sizeof(struct i2c_adapter)); strcpy(cam->i2c_adapter.name, "w9968cf"); + cam->i2c_adapter.dev.parent = &cam->usbdev->dev; i2c_set_adapdata(&cam->i2c_adapter, cam); DBG(6, "Registering I2C adapter with kernel...") @@ -3474,7 +3475,7 @@ ioctl_fail: } -static struct file_operations w9968cf_fops = { +static const struct file_operations w9968cf_fops = { .owner = THIS_MODULE, .open = w9968cf_open, .release = w9968cf_release, |