Skip to content

Commit 5478e47

Browse files
committed
eeprom: at24: correctly set the size for at24mac402
There's an ilog2() expansion in AT24_DEVICE_MAGIC() which rounds down the actual size of EUI-48 byte array in at24mac402 eeproms to 4 from 6, making it impossible to read it all. Fix it by manually adjusting the value in probe(). This patch contains a temporary fix that is suitable for stable branches. Eventually we'll probably remove the call to ilog2() while converting the magic values to actual structs. Cc: [email protected] Fixes: 0b81365 ("eeprom: at24: add support for at24mac series") Signed-off-by: Bartosz Golaszewski <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]>
1 parent 4fbd8d1 commit 5478e47

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

drivers/misc/eeprom/at24.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -730,6 +730,16 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
730730
dev_warn(&client->dev,
731731
"page_size looks suspicious (no power of 2)!\n");
732732

733+
/*
734+
* REVISIT: the size of the EUI-48 byte array is 6 in at24mac402, while
735+
* the call to ilog2() in AT24_DEVICE_MAGIC() rounds it down to 4.
736+
*
737+
* Eventually we'll get rid of the magic values altoghether in favor of
738+
* real structs, but for now just manually set the right size.
739+
*/
740+
if (chip.flags & AT24_FLAG_MAC && chip.byte_len == 4)
741+
chip.byte_len = 6;
742+
733743
/* Use I2C operations unless we're stuck with SMBus extensions. */
734744
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
735745
if (chip.flags & AT24_FLAG_ADDR16)

0 commit comments

Comments
 (0)