diff for duplicates of <10745567643883@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 788aaae..7fa01d7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -40,7 +40,7 @@ diff -Nru a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c - memcpy(buf, &data->data[off], count); + /* Hide Vaio security settings to regular users (16 first bytes) */ -+ if (data->nature = VAIO && off < 16 && !capable(CAP_SYS_ADMIN)) { ++ if (data->nature == VAIO && off < 16 && !capable(CAP_SYS_ADMIN)) { + int in_row1 = 16 - off; + memset(buf, 0, in_row1); + if (count - in_row1 > 0) @@ -67,11 +67,11 @@ diff -Nru a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c + data->nature = UNKNOWN; /* Detect the Vaio nature of EEPROMs. We use the "PCG-" prefix as the signature. */ - if (address = 0x57) { + if (address == 0x57) { @@ -206,17 +217,7 @@ - i2c_smbus_read_byte_data(new_client, 0x81) = 'C' && - i2c_smbus_read_byte_data(new_client, 0x82) = 'G' && - i2c_smbus_read_byte_data(new_client, 0x83) = '-') + i2c_smbus_read_byte_data(new_client, 0x81) == 'C' && + i2c_smbus_read_byte_data(new_client, 0x82) == 'G' && + i2c_smbus_read_byte_data(new_client, 0x83) == '-') - nature = VAIO; - } - diff --git a/a/content_digest b/N1/content_digest index bac0267..ca91a5f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,7 @@ "ref\010745567633966@kroah.com\0" - "ref\01074556757661@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" - "Subject\0[PATCH] i2c driver fixes for 2.6.1\0" - "Date\0Thu, 19 May 2005 06:24:36 +0000\0" + "From\0Greg KH <greg@kroah.com>\0" + "Subject\0Re: [PATCH] i2c driver fixes for 2.6.1\0" + "Date\0Mon, 19 Jan 2004 15:59:24 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "\00:1\0" @@ -49,7 +48,7 @@ " \n" "-\tmemcpy(buf, &data->data[off], count);\n" "+\t/* Hide Vaio security settings to regular users (16 first bytes) */\n" - "+\tif (data->nature = VAIO && off < 16 && !capable(CAP_SYS_ADMIN)) {\n" + "+\tif (data->nature == VAIO && off < 16 && !capable(CAP_SYS_ADMIN)) {\n" "+\t\tint in_row1 = 16 - off;\n" "+\t\tmemset(buf, 0, in_row1);\n" "+\t\tif (count - in_row1 > 0)\n" @@ -76,11 +75,11 @@ "+\tdata->nature = UNKNOWN;\n" " \t/* Detect the Vaio nature of EEPROMs.\n" " \t We use the \"PCG-\" prefix as the signature. */\n" - " \tif (address = 0x57) {\n" + " \tif (address == 0x57) {\n" "@@ -206,17 +217,7 @@\n" - " \t\t i2c_smbus_read_byte_data(new_client, 0x81) = 'C' && \n" - " \t\t i2c_smbus_read_byte_data(new_client, 0x82) = 'G' &&\n" - " \t\t i2c_smbus_read_byte_data(new_client, 0x83) = '-')\n" + " \t\t i2c_smbus_read_byte_data(new_client, 0x81) == 'C' && \n" + " \t\t i2c_smbus_read_byte_data(new_client, 0x82) == 'G' &&\n" + " \t\t i2c_smbus_read_byte_data(new_client, 0x83) == '-')\n" "-\t\t\tnature = VAIO;\n" "-\t}\n" "-\n" @@ -97,4 +96,4 @@ " \n" " \t/* Fill in the remaining client fields */" -dfcc937026592ec73c1e00f4f3c87816f481b7dabf7aadbdef006e5d745a26b4 +b650aeab5b6249de8cc176f18b3f064465380866207825ec1a028bc49159d974
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.