From 2d7689fdc8fa70fe6d3fbd2003a8c1cdaaa786b3 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 21 Feb 2007 12:14:46 -0200 Subject: Backport: make file_operations const From: Mauro Carvalho Chehab Backport a kernel patch by Arjan van de Ven that made all file_operations instances const. Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/w9968cf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux/drivers/media/video/w9968cf.c') diff --git a/linux/drivers/media/video/w9968cf.c b/linux/drivers/media/video/w9968cf.c index c165239f4..ccdb6acc5 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*); @@ -3474,7 +3474,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, -- cgit v1.2.3 From a10fafffd600af5d428876815d7da534e3a4c824 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 21 Feb 2007 12:53:03 -0200 Subject: backport changeset 12a917f69d1468c91d646dbad8408dd0d39d6207 From: Mauro Carvalho Chehab Backport changeset from Jean Delvare that declare i2c_adapter parent devices. kernel-sync: Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/w9968cf.c | 1 + 1 file changed, 1 insertion(+) (limited to 'linux/drivers/media/video/w9968cf.c') diff --git a/linux/drivers/media/video/w9968cf.c b/linux/drivers/media/video/w9968cf.c index ccdb6acc5..f27f8f152 100644 --- a/linux/drivers/media/video/w9968cf.c +++ b/linux/drivers/media/video/w9968cf.c @@ -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...") -- cgit v1.2.3