diff for duplicates of <1052267615125@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 77ae65d..e3572af 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -224,7 +224,7 @@ diff -Nru a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c static int msp_probe(struct i2c_adapter *adap) { -- if (adap->id = (I2C_ALGO_BIT | I2C_HW_B_BT848)) +- if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848)) + if (adap->class & I2C_ADAP_CLASS_TV_ANALOG) return i2c_probe(adap, &addr_data, msp_attach); return 0; @@ -238,7 +238,7 @@ diff -Nru a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c { - /* Only attach these chips to the BT848 bus for now */ - -- if (adap->id = (I2C_ALGO_BIT | I2C_HW_B_BT848)) +- if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848)) - { + if (adap->class & I2C_ADAP_CLASS_TV_ANALOG) return i2c_probe(adap, &addr_data, saa5249_attach); @@ -264,7 +264,7 @@ diff -Nru a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c static int tda7432_probe(struct i2c_adapter *adap) { -- if (adap->id = (I2C_ALGO_BIT | I2C_HW_B_BT848)) +- if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848)) + if (adap->class & I2C_ADAP_CLASS_TV_ANALOG) return i2c_probe(adap, &addr_data, tda7432_attach); return 0; @@ -276,7 +276,7 @@ diff -Nru a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c static int tda9875_probe(struct i2c_adapter *adap) { -- if (adap->id = (I2C_ALGO_BIT | I2C_HW_B_BT848)) +- if (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848)) + if (adap->class & I2C_ADAP_CLASS_TV_ANALOG) return i2c_probe(adap, &addr_data, tda9875_attach); return 0; @@ -390,7 +390,7 @@ diff -Nru a/include/linux/i2c.h b/include/linux/i2c.h +++ b/include/linux/i2c.h Tue May 6 17:24:33 2003 @@ -225,6 +225,7 @@ struct module *owner; - unsigned int id;/* = is algo->id | hwdep.struct->id, */ + unsigned int id;/* == is algo->id | hwdep.struct->id, */ /* for registered values see below */ + unsigned int class; struct i2c_algorithm *algo;/* the algorithm to access the bus */ diff --git a/a/content_digest b/N1/content_digest index e69454e..93c4f76 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010522676141842@kroah.com\0" - "ref\010522676142536@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver changes for 2.5.69\0" - "Date\0Thu, 19 May 2005 06:23:55 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver changes for 2.5.69\0" + "Date\0Tue, 6 May 2003 17:33:35 -0700\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -233,7 +232,7 @@ " \n" " static int msp_probe(struct i2c_adapter *adap)\n" " {\n" - "-\tif (adap->id = (I2C_ALGO_BIT | I2C_HW_B_BT848))\n" + "-\tif (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))\n" "+\tif (adap->class & I2C_ADAP_CLASS_TV_ANALOG)\n" " \t\treturn i2c_probe(adap, &addr_data, msp_attach);\n" " \treturn 0;\n" @@ -247,7 +246,7 @@ " {\n" "-\t/* Only attach these chips to the BT848 bus for now */\n" "-\t\n" - "-\tif (adap->id = (I2C_ALGO_BIT | I2C_HW_B_BT848))\n" + "-\tif (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))\n" "-\t{\n" "+\tif (adap->class & I2C_ADAP_CLASS_TV_ANALOG)\n" " \t\treturn i2c_probe(adap, &addr_data, saa5249_attach);\n" @@ -273,7 +272,7 @@ " \n" " static int tda7432_probe(struct i2c_adapter *adap)\n" " {\n" - "-\tif (adap->id = (I2C_ALGO_BIT | I2C_HW_B_BT848))\n" + "-\tif (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))\n" "+\tif (adap->class & I2C_ADAP_CLASS_TV_ANALOG)\n" " \t\treturn i2c_probe(adap, &addr_data, tda7432_attach);\n" " \treturn 0;\n" @@ -285,7 +284,7 @@ " \n" " static int tda9875_probe(struct i2c_adapter *adap)\n" " {\n" - "-\tif (adap->id = (I2C_ALGO_BIT | I2C_HW_B_BT848))\n" + "-\tif (adap->id == (I2C_ALGO_BIT | I2C_HW_B_BT848))\n" "+\tif (adap->class & I2C_ADAP_CLASS_TV_ANALOG)\n" " \t\treturn i2c_probe(adap, &addr_data, tda9875_attach);\n" " \treturn 0;\n" @@ -399,7 +398,7 @@ "+++ b/include/linux/i2c.h\tTue May 6 17:24:33 2003\n" "@@ -225,6 +225,7 @@\n" " \tstruct module *owner;\n" - " \tunsigned int id;/* = is algo->id | hwdep.struct->id, \t\t*/\n" + " \tunsigned int id;/* == is algo->id | hwdep.struct->id, \t\t*/\n" " \t\t\t/* for registered values see below\t\t*/\n" "+\tunsigned int class;\n" " \tstruct i2c_algorithm *algo;/* the algorithm to access the bus\t*/\n" @@ -419,4 +418,4 @@ " /* i2c_client_address_data is the struct for holding default client\n" * addresses for a driver and for the parameters supplied on the -ab62f4d53fddb1d5dd6dc6943aafc2a74db76fbbca71a6c9a9e6cbe64f0d36a5 +435167e07e5d385765a76d6512373fab23751e973f92ecef1803692815dad457
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.