Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1272783

[PATCH v2 1/5] misc: eeprom_93xx46: Fix 16-bit read and write accesses.

Show all headers | View raw

Compatible at93xx46 devices from both Microchip and Atmel expect a
word-based address, regardless of whether the device is strapped for 8-
or 16-bit operation.  However, the offset parameter passed in when
reading or writing at a specific location is always specified in terms
of bytes.

This commit fixes 16-bit read and write accesses by shifting the offset
parameter to account for this difference between a byte offset and a
word-based address.

Signed-off-by: Cory Tusar <cory.tusar@pid1solutions.com>
---
 drivers/misc/eeprom/eeprom_93xx46.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c
index ff63f05..e1bf0a5 100644
--- a/drivers/misc/eeprom/eeprom_93xx46.c
+++ b/drivers/misc/eeprom/eeprom_93xx46.c
@@ -54,7 +54,7 @@ eeprom_93xx46_bin_read(struct file *filp, struct kobject *kobj,
 		cmd_addr |= off & 0x7f;
 		bits = 10;
 	} else {
-		cmd_addr |= off & 0x3f;
+		cmd_addr |= (off >> 1) & 0x3f;
 		bits = 9;
 	}
 
@@ -155,7 +155,7 @@ eeprom_93xx46_write_word(struct eeprom_93xx46_dev *edev,
 		bits = 10;
 		data_len = 1;
 	} else {
-		cmd_addr |= off & 0x3f;
+		cmd_addr |= (off >> 1) & 0x3f;
 		bits = 9;
 		data_len = 2;
 	}
-- 
2.4.10

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/5] Devicetree support for misc/eeprom/eeprom_93xx46. Cory Tusar <cory.tusar@pid1solutions.com> - 2015-11-19 04:40 +0100
  [PATCH v2 1/5] misc: eeprom_93xx46: Fix 16-bit read and write accesses. Cory Tusar <cory.tusar@pid1solutions.com> - 2015-11-19 04:40 +0100
  [PATCH v2 2/5] Documentation: devicetree: Add DT bindings to eeprom_93xx46 driver. Cory Tusar <cory.tusar@pid1solutions.com> - 2015-11-19 04:40 +0100
    Re: [PATCH v2 2/5] Documentation: devicetree: Add DT bindings to  eeprom_93xx46 driver. Rob Herring <robh@kernel.org> - 2015-11-19 16:00 +0100
      Re: [PATCH v2 2/5] Documentation: devicetree: Add DT bindings to  eeprom_93xx46 driver. Cory Tusar <cory.tusar@pid1solutions.com> - 2015-11-19 18:40 +0100
  [PATCH v2 3/5] misc: eeprom_93xx46: Implement eeprom_93xx46 DT bindings. Cory Tusar <cory.tusar@pid1solutions.com> - 2015-11-19 04:40 +0100
    Re: [PATCH v2 3/5] misc: eeprom_93xx46: Implement eeprom_93xx46 DT  bindings. Vladimir Zapolskiy <vz@mleia.com> - 2015-11-19 07:00 +0100
      Re: [PATCH v2 3/5] misc: eeprom_93xx46: Implement eeprom_93xx46 DT  bindings. "Andrew F. Davis" <afd@ti.com> - 2015-11-19 15:10 +0100
        Re: [PATCH v2 3/5] misc: eeprom_93xx46: Implement eeprom_93xx46 DT  bindings. Vladimir Zapolskiy <vz@mleia.com> - 2015-11-19 17:20 +0100
        Re: [PATCH v2 3/5] misc: eeprom_93xx46: Implement eeprom_93xx46 DT  bindings. Cory Tusar <cory.tusar@pid1solutions.com> - 2015-11-21 06:00 +0100
      Re: [PATCH v2 3/5] misc: eeprom_93xx46: Implement eeprom_93xx46 DT  bindings. Cory Tusar <cory.tusar@pid1solutions.com> - 2015-11-21 05:50 +0100
        Re: [PATCH v2 3/5] misc: eeprom_93xx46: Implement eeprom_93xx46 DT  bindings. Vladimir Zapolskiy <vz@mleia.com> - 2015-11-21 19:40 +0100
          Re: [PATCH v2 3/5] misc: eeprom_93xx46: Implement eeprom_93xx46 DT  bindings. Cory Tusar <cory.tusar@pid1solutions.com> - 2015-11-23 19:30 +0100
  [PATCH v2 4/5] misc: eeprom_93xx46: Add quirks to support Atmel AT93C46D device. Cory Tusar <cory.tusar@pid1solutions.com> - 2015-11-19 04:40 +0100
    Re: [PATCH v2 4/5] misc: eeprom_93xx46: Add quirks to support Atmel  AT93C46D device. Vladimir Zapolskiy <vz@mleia.com> - 2015-11-19 07:00 +0100
      Re: [PATCH v2 4/5] misc: eeprom_93xx46: Add quirks to support Atmel  AT93C46D device. Cory Tusar <cory.tusar@pid1solutions.com> - 2015-11-23 18:50 +0100
  [PATCH v2 5/5] misc: eeprom_93xx46: Add support for a GPIO 'select' line. Cory Tusar <cory.tusar@pid1solutions.com> - 2015-11-19 04:40 +0100
    Re: [PATCH v2 5/5] misc: eeprom_93xx46: Add support for a GPIO 'select'  line. Vladimir Zapolskiy <vz@mleia.com> - 2015-11-19 07:10 +0100
      Re: [PATCH v2 5/5] misc: eeprom_93xx46: Add support for a GPIO  'select' line. Andrew Lunn <andrew@lunn.ch> - 2015-11-19 15:20 +0100
        Re: [PATCH v2 5/5] misc: eeprom_93xx46: Add support for a GPIO 'select'  line. Vladimir Zapolskiy <vz@mleia.com> - 2015-11-19 18:00 +0100
          Re: [PATCH v2 5/5] misc: eeprom_93xx46: Add support for a GPIO  'select' line. Andrew Lunn <andrew@lunn.ch> - 2015-11-19 18:20 +0100
      Re: [PATCH v2 5/5] misc: eeprom_93xx46: Add support for a GPIO  'select' line. Cory Tusar <cory.tusar@pid1solutions.com> - 2015-11-25 06:00 +0100

csiph-web