diff options
| author |   Bartosz Golaszewski <brgl@bgdev.pl> | 2018-05-07 12:08:37 +0200 |
|---|---|---|
| committer | Bartosz Golaszewski <brgl@bgdev.pl> | 2018-05-16 14:42:46 +0200 |
| commit | 5fa4d14e55ec5370dcb373d2aa7a882ea9b5be16 (patch) | |
| tree | f8ca8303b3eb57be3af56244e8c95d7df7d17b10 /drivers/misc/eeprom | |
| parent | Linux 4.17-rc5 (diff) | |
| download | linux-dev-5fa4d14e55ec5370dcb373d2aa7a882ea9b5be16.tar.xz linux-dev-5fa4d14e55ec5370dcb373d2aa7a882ea9b5be16.zip | |
eeprom: at24: fix retrieving the at24_chip_data structure
Commit feb2f19b1e8f ("eeprom: at24: move platform data processing into
a separate routine") introduced a bug where we incorrectly retireve the
at24_chip_data structure. Remove the unnecessary ampersand operator.
Fixes: feb2f19b1e8f ("eeprom: at24: move platform data processing into a separate routine")
Reported-by: Vadim Pasternak <vadimp@mellanox.com>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
Diffstat (limited to 'drivers/misc/eeprom')
| -rw-r--r-- | drivers/misc/eeprom/at24.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index 0c125f207aea..33053b0d1fdf 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -518,7 +518,7 @@ static int at24_get_pdata(struct device *dev, struct at24_platform_data *pdata) if (of_node && of_match_device(at24_of_match, dev)) cdata = of_device_get_match_data(dev); else if (id) - cdata = (void *)&id->driver_data; + cdata = (void *)id->driver_data; else cdata = acpi_device_get_match_data(dev); |