diff for duplicates of <10476033213315@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 56a83c0..b48d47e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -36,7 +36,7 @@ diff -Nru a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c unsigned char temp; - /* First check whether we can access PCI at all */ -- if (pci_present() = 0) { +- if (pci_present() == 0) { - printk(KERN_WARNING "i2c-i801.o: Error: No PCI-bus found!\n"); - error_return = -ENODEV; - goto END; @@ -57,14 +57,14 @@ diff -Nru a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c + if(PCI_FUNC(dev->devfn) != 3) + return -ENODEV; -- if (I801_dev = NULL) { +- if (I801_dev == NULL) { - printk - (KERN_WARNING "i2c-i801.o: Error: Can't detect I801, function 3!\n"); - error_return = -ENODEV; - goto END; - } + I801_dev = dev; - isich4 = *num = PCI_DEVICE_ID_INTEL_82801DB_SMBUS; + isich4 = *num == PCI_DEVICE_ID_INTEL_82801DB_SMBUS; /* Determine the address of the SMBus areas */ @@ -658,13 +630,43 @@ diff --git a/a/content_digest b/N1/content_digest index 3df2643..f8ce8b0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\010476033191486@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver changes for 2.5.64\0" - "Date\0Thu, 19 May 2005 06:23:49 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver changes for 2.5.64\0" + "Date\0Thu, 13 Mar 2003 16:55 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -44,7 +44,7 @@ " \tunsigned char temp;\n" " \n" "-\t/* First check whether we can access PCI at all */\n" - "-\tif (pci_present() = 0) {\n" + "-\tif (pci_present() == 0) {\n" "-\t\tprintk(KERN_WARNING \"i2c-i801.o: Error: No PCI-bus found!\\n\");\n" "-\t\terror_return = -ENODEV;\n" "-\t\tgoto END;\n" @@ -65,14 +65,14 @@ "+\tif(PCI_FUNC(dev->devfn) != 3)\n" "+\t\treturn -ENODEV;\n" " \n" - "-\tif (I801_dev = NULL) {\n" + "-\tif (I801_dev == NULL) {\n" "-\t\tprintk\n" "-\t\t (KERN_WARNING \"i2c-i801.o: Error: Can't detect I801, function 3!\\n\");\n" "-\t\terror_return = -ENODEV;\n" "-\t\tgoto END;\n" "-\t}\n" "+\tI801_dev = dev;\n" - " \tisich4 = *num = PCI_DEVICE_ID_INTEL_82801DB_SMBUS;\n" + " \tisich4 = *num == PCI_DEVICE_ID_INTEL_82801DB_SMBUS;\n" " \n" " /* Determine the address of the SMBus areas */\n" "@@ -658,13 +630,43 @@\n" @@ -121,4 +121,4 @@ " \t\t (KERN_WARNING \"i2c-i801.o: I801 not detected, module not inserted.\\n\");\n" " \t\treturn -ENODEV;" -26dfa4039da8f28e844822dc123094a2dc381c3a424eba008d78e9b95100085b +0317595ad6548ba4a4b10a7c0bbbfb1530d1456b3ffedf0777a7c11b69a4a682
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.