wok-next view v4l-dvb/stuff/414e0bbd99bf @ rev 10797

Up: wireshark to 1.4.7. Security Fix.
author Christopher Rogers <slaxemulator@gmail.com>
date Thu Jun 02 22:49:19 2011 +0000 (2011-06-02)
parents
children
line source
1
2 # HG changeset patch
3 # User Igor M. Liplianin <liplianin@me.by>
4 # Date 1293902198 -7200
5 # Node ID 414e0bbd99bf23b178c4b8aa539ef8f9f270117e
6 # Parent d64b014c5253e3699e025339619a6f7704f2fb81
7 [PATCH 1/1] [media] i2c: Stop using I2C_CLASS_TV_ANALOG
8
9 From: Jean Delvare <khali@linux-fr.org>
10
11 Detection class I2C_CLASS_TV_ANALOG is set by a few adapters but no
12 I2C device driver is setting it anymore, which means it can be
13 dropped. I2C devices on analog TV adapters are instantiated
14 explicitly these days, which is much better.
15
16 Signed-off-by: Jean Delvare <khali@linux-fr.org>
17 Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
18
19 --- a/linux/drivers/media/video/hdpvr/hdpvr-i2c.c Sat Jan 01 19:13:39 2011 +0200
20 +++ b/linux/drivers/media/video/hdpvr/hdpvr-i2c.c Sat Jan 01 19:16:38 2011 +0200
21 @@ -127,7 +127,6 @@
22 strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
23 sizeof(i2c_adap->name));
24 i2c_adap->algo = &hdpvr_algo;
25 - i2c_adap->class = I2C_CLASS_TV_ANALOG;
26 i2c_adap->owner = THIS_MODULE;
27 i2c_adap->dev.parent = &dev->udev->dev;
28
29 --- a/linux/drivers/media/video/hexium_gemini.c Sat Jan 01 19:13:39 2011 +0200
30 +++ b/linux/drivers/media/video/hexium_gemini.c Sat Jan 01 19:16:38 2011 +0200
31 @@ -368,7 +368,6 @@
32 saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));
33
34 hexium->i2c_adapter = (struct i2c_adapter) {
35 - .class = I2C_CLASS_TV_ANALOG,
36 .name = "hexium gemini",
37 };
38 saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
39 --- a/linux/drivers/media/video/hexium_orion.c Sat Jan 01 19:13:39 2011 +0200
40 +++ b/linux/drivers/media/video/hexium_orion.c Sat Jan 01 19:16:38 2011 +0200
41 @@ -231,7 +231,6 @@
42 saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
43
44 hexium->i2c_adapter = (struct i2c_adapter) {
45 - .class = I2C_CLASS_TV_ANALOG,
46 .name = "hexium orion",
47 };
48 saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
49