Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb54ad6c authored by Cory Tusar's avatar Cory Tusar Committed by Greg Kroah-Hartman
Browse files

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: default avatarCory Tusar <cory.tusar@pid1solutions.com>
Tested-by: default avatarChris Healy <chris.healy@zii.aero>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 10a3fbf1

drivers/misc/eeprom/eeprom_93xx46.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}