X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2Fmedia%2Fw9968cf.c;h=eb257e55a0148b3da93567c7bff9d2ea45b3b481;hb=78a6196531f0fe10aae05a9bc4c2701df614ac3d;hp=107ed4c2241b2fcf89e54240c8b051ac8b160cb4;hpb=86090fcac5e27b630656fe3d963a6b80e26dac44;p=linux-2.6.git

diff --git a/drivers/usb/media/w9968cf.c b/drivers/usb/media/w9968cf.c
index 107ed4c22..eb257e55a 100644
--- a/drivers/usb/media/w9968cf.c
+++ b/drivers/usb/media/w9968cf.c
@@ -1578,7 +1578,7 @@ static int w9968cf_i2c_init(struct w9968cf_device* cam)
 
 	static struct i2c_adapter adap = {
 		.id =                I2C_ALGO_SMBUS | I2C_HW_SMBUS_W9968CF,
-		.class =             I2C_ADAP_CLASS_CAM_DIGITAL,
+		.class =             I2C_CLASS_CAM_DIGITAL,
 		.owner =             THIS_MODULE,
 		.client_register =   w9968cf_i2c_attach_inform,
 		.client_unregister = w9968cf_i2c_detach_inform,
@@ -2915,7 +2915,7 @@ w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
                   unsigned int cmd, void* arg)
 {
 	struct w9968cf_device* cam;
-	const char* v4l1_ioctls[] = {
+	static const char* v4l1_ioctls[] = {
 		"?", "CGAP", "GCHAN", "SCHAN", "GTUNER", "STUNER", 
 		"GPICT", "SPICT", "CCAPTURE", "GWIN", "SWIN", "GFBUF",
 		"SFBUF", "KEY", "GFREQ", "SFREQ", "GAUDIO", "SAUDIO",
@@ -2923,6 +2923,8 @@ w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
 		"SPLAYMODE", "SWRITEMODE", "GPLAYINFO", "SMICROCODE", 
 		"GVBIFMT", "SVBIFMT" 
 	};
+	struct video_tuner tuner;
+	struct video_channel chan;
 
 	#define V4L1_IOCTL(cmd) \
 	        ((_IOC_NR((cmd)) < sizeof(v4l1_ioctls)/sizeof(char*)) ? \
@@ -2957,7 +2959,6 @@ w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
 
 	case VIDIOCGCHAN: /* get video channel informations */
 	{
-		struct video_channel chan;
 		if (copy_from_user(&chan, arg, sizeof(chan)))
 			return -EFAULT;
 
@@ -2979,8 +2980,6 @@ w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
 
 	case VIDIOCSCHAN: /* set active channel */
 	{
-		struct video_channel chan;
-
 		if (copy_from_user(&chan, arg, sizeof(chan)))
 			return -EFAULT;
 
@@ -3369,7 +3368,6 @@ w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
 
 	case VIDIOCGTUNER:
 	{
-		struct video_tuner tuner;
 		if (copy_from_user(&tuner, arg, sizeof(tuner)))
 			return -EFAULT;
 
@@ -3392,7 +3390,6 @@ w9968cf_v4l_ioctl(struct inode* inode, struct file* filp,
 
 	case VIDIOCSTUNER:
 	{
-		struct video_tuner tuner;
 		if (copy_from_user(&tuner, arg, sizeof(tuner)))
 			return -EFAULT;