diff options
| author | Linus Torvalds | 2020-07-31 12:50:54 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-07-31 12:50:54 -0700 |
| commit | 7dc6fd0f3b8404542718039f5de19fe56e474578 (patch) | |
| tree | f97b54bdb21ffa69e1fe8f4c049f762ada6cc479 /include | |
| parent | deacdb3e3979979016fcd0ffd518c320a62ad166 (diff) | |
| parent | 8808981baf96e1b3dea1f08461e4d958aa0dbde1 (diff) | |
Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c fixes from Wolfram Sang:
"Some I2C core improvements to prevent NULL pointer usage and a
MAINTAINERS update"
* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
i2c: slave: add sanity check when unregistering
i2c: slave: improve sanity check when registering
MAINTAINERS: Update GENI I2C maintainers list
i2c: also convert placeholder function to return errno
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/i2c.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/i2c.h b/include/linux/i2c.h index ee328cf80bd9..4e7714c88f95 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -1001,7 +1001,7 @@ static inline u32 i2c_acpi_find_bus_speed(struct device *dev) static inline struct i2c_client *i2c_acpi_new_device(struct device *dev, int index, struct i2c_board_info *info) { - return NULL; + return ERR_PTR(-ENODEV); } static inline struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle) { |