diff for duplicates of <20041024194053.36aefdc2.khali@linux-fr.org> diff --git a/a/1.txt b/N1/1.txt index 6bedfd0..bf8c940 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -144,8 +144,8 @@ diff -ruN linux-2.6.9-rc4-bk1/drivers/i2c/busses.orig/i2c-amd756-s4882.c linux-2 + int error; + + /* We exclude the multiplexed addresses */ -+ if (addr = 0x4c || (addr & 0xfc) = 0x50 || (addr & 0xfc) = 0x30 -+ || addr = 0x18) ++ if (addr == 0x4c || (addr & 0xfc) == 0x50 || (addr & 0xfc) == 0x30 ++ || addr == 0x18) + return -1; + + down(&amd756_lock); @@ -244,7 +244,7 @@ diff -ruN linux-2.6.9-rc4-bk1/drivers/i2c/busses.orig/i2c-amd756-s4882.c linux-2 + union i2c_smbus_data ioconfig; + + if (pci_find_subsys(PCI_VENDOR_ID_AMD, 0x746B, PCI_VENDOR_ID_AMD, -+ 0x36C0, NULL) = NULL) ++ 0x36C0, NULL) == NULL) + return -ENODEV; + + printk(KERN_INFO "Enabling SMBus multiplexing for Tyan S4882\n"); @@ -395,8 +395,8 @@ diff -ruN linux-2.6.9-rc4-bk1/drivers/i2c/busses.orig/i2c-amd756.c linux-2.6.9-r @@ -330,6 +332,7 @@ const struct pci_device_id *id) { - int nforce = (id->driver_data = NFORCE); -+ int s4882 = (id->driver_data = S4882); + int nforce = (id->driver_data == NFORCE); ++ int s4882 = (id->driver_data == S4882); int error; u8 temp; diff --git a/a/content_digest b/N1/content_digest index a836314..db68334 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\020041023200215.38e375a1.khali@linux-fr.org\0" "ref\020041024123557.744414cc.khali@linux-fr.org\0" - "From\0khali@linux-fr.org (Jean Delvare)\0" - "Subject\0More on SMBus multiplexing\0" - "Date\0Thu, 19 May 2005 06:25:20 +0000\0" + "From\0Jean Delvare <khali@linux-fr.org>\0" + "Subject\0Re: More on SMBus multiplexing\0" + "Date\0Sun, 24 Oct 2004 19:40:53 +0200\0" "To\0Greg KH <greg@kroah.com>\0" "Cc\0LM Sensors <sensors@stimpy.netroedge.com>" " LKML <linux-kernel@vger.kernel.org>\0" @@ -154,8 +154,8 @@ "+\tint error;\n" "+\n" "+\t/* We exclude the multiplexed addresses */\n" - "+\tif (addr = 0x4c || (addr & 0xfc) = 0x50 || (addr & 0xfc) = 0x30\n" - "+\t || addr = 0x18)\n" + "+\tif (addr == 0x4c || (addr & 0xfc) == 0x50 || (addr & 0xfc) == 0x30\n" + "+\t || addr == 0x18)\n" "+\t\treturn -1;\n" "+\n" "+\tdown(&amd756_lock);\n" @@ -254,7 +254,7 @@ "+\tunion i2c_smbus_data ioconfig;\n" "+\n" "+\tif (pci_find_subsys(PCI_VENDOR_ID_AMD, 0x746B, PCI_VENDOR_ID_AMD,\n" - "+\t\t\t 0x36C0, NULL) = NULL)\n" + "+\t\t\t 0x36C0, NULL) == NULL)\n" "+\t\treturn -ENODEV;\n" "+\n" "+\tprintk(KERN_INFO \"Enabling SMBus multiplexing for Tyan S4882\\n\");\n" @@ -405,8 +405,8 @@ "@@ -330,6 +332,7 @@\n" " \t\t\t\t const struct pci_device_id *id)\n" " {\n" - " \tint nforce = (id->driver_data = NFORCE);\n" - "+\tint s4882 = (id->driver_data = S4882);\n" + " \tint nforce = (id->driver_data == NFORCE);\n" + "+\tint s4882 = (id->driver_data == S4882);\n" " \tint error;\n" " \tu8 temp;\n" " \t\n" @@ -458,4 +458,4 @@ "Jean Delvare\n" http://khali.linux-fr.org/ -391085c0f42560b0e09694fd8bee0eddf567a8ba2b94aeb2c7fae718e568d928 +5b896dee7f4504e2235061339df10c52f94b4107fab704c939e9d1508b41588f
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.