diff options
| author | Cory Tusar <cory.tusar@pid1solutions.com> | 2016-01-06 22:55:00 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-02-09 17:27:45 -0800 |
| commit | cb54ad6cddb606add2481b82901d69670b480d1b (patch) | |
| tree | 89513113a0b581d16d7af0310dba8a4cb1bd5c0f /drivers/misc/eeprom | |
| parent | 10a3fbf18d99caeeecd2b28445d9104deab11ed7 (diff) | |
| download | linux-rpi-cb54ad6cddb606add2481b82901d69670b480d1b.tar.gz linux-rpi-cb54ad6cddb606add2481b82901d69670b480d1b.tar.bz2 linux-rpi-cb54ad6cddb606add2481b82901d69670b480d1b.zip | |
misc: eeprom_93xx46: Fix 16-bit read and write accesses.
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>
Tested-by: Chris Healy <chris.healy@zii.aero>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/eeprom')
| -rw-r--r-- | drivers/misc/eeprom/eeprom_93xx46.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/eeprom/eeprom_93xx46.c b/drivers/misc/eeprom/eeprom_93xx46.c index 473aa0a2eaf6..da3c081c2639 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; } |