Skip to content
Snippets Groups Projects
Commit a16ab11e authored by Federico Vaga's avatar Federico Vaga
Browse files

Merge branch 'release/v1.1.3'

parents 676deab9 ce7e233f
No related merge requests found
Pipeline #1955 failed with stages
in 0 seconds
Hide whitespace changes
Inline Side-by-side
CHANGELOG.rst
+ 7
− 1
View file @ a16ab11e
...@@ -7,7 +7,13 @@ ...@@ -7,7 +7,13 @@
Changelog Changelog
========= =========
1.1.1 - 2021-07-06 1.1.3 - 2021-07-29
==================
Fixed
-----
- sw: improve compatibility with newer ( >3.10) Linux kernel versions
1.1.2 - 2021-07-06
================== ==================
Changed Changed
......
drivers/fmc/fmc-eeprom.c
+ 5
− 0
View file @ a16ab11e
...@@ -113,8 +113,13 @@ static int __fmc_slot_eeprom_add(struct fmc_slot *slot, ...@@ -113,8 +113,13 @@ static int __fmc_slot_eeprom_add(struct fmc_slot *slot,
} }
info_l.addr = fmc_slot_i2c_address(info_l.addr, slot->ga); info_l.addr = fmc_slot_i2c_address(info_l.addr, slot->ga);
#if KERNEL_VERSION(5, 8, 0) <= LINUX_VERSION_CODE
slot->eeprom = i2c_new_client_device(slot->adapter, &info_l);
if (IS_ERR(slot->eeprom))
#else
slot->eeprom = i2c_new_device(slot->adapter, &info_l); slot->eeprom = i2c_new_device(slot->adapter, &info_l);
if (!slot->eeprom) if (!slot->eeprom)
#endif
return -ENODEV; return -ENODEV;
err = sysfs_create_link(&slot->dev.kobj, &slot->eeprom->dev.kobj, err = sysfs_create_link(&slot->dev.kobj, &slot->eeprom->dev.kobj,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment