Commit a9bdddb8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c bugfix from Wolfram Sang.

* 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
  i2c: Re-instate body of i2c_parent_is_i2c_adapter()
parents 2e67c562 2fac2b89
...@@ -445,7 +445,7 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data) ...@@ -445,7 +445,7 @@ static inline void i2c_set_adapdata(struct i2c_adapter *dev, void *data)
static inline struct i2c_adapter * static inline struct i2c_adapter *
i2c_parent_is_i2c_adapter(const struct i2c_adapter *adapter) i2c_parent_is_i2c_adapter(const struct i2c_adapter *adapter)
{ {
#if IS_ENABLED(I2C_MUX) #if IS_ENABLED(CONFIG_I2C_MUX)
struct device *parent = adapter->dev.parent; struct device *parent = adapter->dev.parent;
if (parent != NULL && parent->type == &i2c_adapter_type) if (parent != NULL && parent->type == &i2c_adapter_type)
......
Markdown is supported
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