diff options
author | Bartosz Golaszewski <brgl@bgdev.pl> | 2018-05-07 12:08:37 +0200 |
---|---|---|
committer | Bartosz Golaszewski <brgl@bgdev.pl> | 2018-05-09 17:16:06 +0200 |
commit | 76aa3de7095f15af7300012cb29ea8ab93eec348 (patch) | |
tree | 3edd19f4121c5bb6ca98b22a0aa070fde65e5714 /drivers/misc/eeprom | |
parent | 75bc37fefc4471e718ba8e651aa74673d4e0a9eb (diff) | |
download | linux-stable-76aa3de7095f15af7300012cb29ea8ab93eec348.tar.gz linux-stable-76aa3de7095f15af7300012cb29ea8ab93eec348.tar.bz2 linux-stable-76aa3de7095f15af7300012cb29ea8ab93eec348.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); |