diff for duplicates of <1105998395257@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 7071e4b..ce657fd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -71,11 +71,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 (i2c_smbus_read_byte_data(new_client, 0x80) = 'P' && -- 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) = '-') +- if (address == 0x57) { +- if (i2c_smbus_read_byte_data(new_client, 0x80) == 'P' && +- 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) == '-') - data->nature = VAIO; - } - @@ -93,11 +93,11 @@ diff -Nru a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c + + /* Detect the Vaio nature of EEPROMs. + We use the "PCG-" prefix as the signature. */ -+ if (address = 0x57) { -+ if (i2c_smbus_read_byte_data(new_client, 0x80) = 'P' -+ && i2c_smbus_read_byte(new_client) = 'C' -+ && i2c_smbus_read_byte(new_client) = 'G' -+ && i2c_smbus_read_byte(new_client) = '-') ++ if (address == 0x57) { ++ if (i2c_smbus_read_byte_data(new_client, 0x80) == 'P' ++ && i2c_smbus_read_byte(new_client) == 'C' ++ && i2c_smbus_read_byte(new_client) == 'G' ++ && i2c_smbus_read_byte(new_client) == '-') + dev_info(&new_client->dev, "Vaio EEPROM detected, " + "enabling password protection\n"); + data->nature = VAIO; diff --git a/a/content_digest b/N1/content_digest index 7c5fc3b..f220d6a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\011059983951840@kroah.com\0" - "From\0greg@kroah.com (Greg KH)\0" + "From\0Greg KH <greg@kroah.com>\0" "Subject\0[PATCH] I2C: Cleanups to the eeprom driver\0" - "Date\0Thu, 19 May 2005 06:25:31 +0000\0" + "Date\0Mon, 17 Jan 2005 13:46:35 -0800\0" "To\0linux-kernel@vger.kernel.org" " sensors@stimpy.netroedge.com\0" "Cc\0khali@linux-fr.org\0" @@ -80,11 +80,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" - "-\t\tif (i2c_smbus_read_byte_data(new_client, 0x80) = 'P' && \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" + "-\tif (address == 0x57) {\n" + "-\t\tif (i2c_smbus_read_byte_data(new_client, 0x80) == 'P' && \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\tdata->nature = VAIO;\n" "-\t}\n" "-\n" @@ -102,11 +102,11 @@ "+\n" "+\t/* Detect the Vaio nature of EEPROMs.\n" "+\t We use the \"PCG-\" prefix as the signature. */\n" - "+\tif (address = 0x57) {\n" - "+\t\tif (i2c_smbus_read_byte_data(new_client, 0x80) = 'P'\n" - "+\t\t && i2c_smbus_read_byte(new_client) = 'C'\n" - "+\t\t && i2c_smbus_read_byte(new_client) = 'G'\n" - "+\t\t && i2c_smbus_read_byte(new_client) = '-')\n" + "+\tif (address == 0x57) {\n" + "+\t\tif (i2c_smbus_read_byte_data(new_client, 0x80) == 'P'\n" + "+\t\t && i2c_smbus_read_byte(new_client) == 'C'\n" + "+\t\t && i2c_smbus_read_byte(new_client) == 'G'\n" + "+\t\t && i2c_smbus_read_byte(new_client) == '-')\n" "+\t\t\tdev_info(&new_client->dev, \"Vaio EEPROM detected, \"\n" "+\t\t\t\t\"enabling password protection\\n\");\n" "+\t\t\tdata->nature = VAIO;\n" @@ -115,4 +115,4 @@ " \t/* create the sysfs eeprom file */\n" " \tsysfs_create_bin_file(&new_client->dev.kobj, &eeprom_attr);" -c7e74ee6b21431c4c37a405bfe5b6173d9b3038ef23436f1b89d97daa2033b6a +738066c78b835a8ef78297eb95db6796fb436e9a97e80473341d48c95bcd307c
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.