diff options
Diffstat (limited to 'drivers/i2c/i2c-dev.c')
| -rw-r--r-- | drivers/i2c/i2c-dev.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index 5f3a52d517c3..cec0f3ba97f8 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c | |||
| @@ -192,13 +192,12 @@ static int i2cdev_check(struct device *dev, void *addrp) | |||
| 192 | /* walk up mux tree */ | 192 | /* walk up mux tree */ |
| 193 | static int i2cdev_check_mux_parents(struct i2c_adapter *adapter, int addr) | 193 | static int i2cdev_check_mux_parents(struct i2c_adapter *adapter, int addr) |
| 194 | { | 194 | { |
| 195 | struct i2c_adapter *parent = i2c_parent_is_i2c_adapter(adapter); | ||
| 195 | int result; | 196 | int result; |
| 196 | 197 | ||
| 197 | result = device_for_each_child(&adapter->dev, &addr, i2cdev_check); | 198 | result = device_for_each_child(&adapter->dev, &addr, i2cdev_check); |
| 198 | 199 | if (!result && parent) | |
| 199 | if (!result && i2c_parent_is_i2c_adapter(adapter)) | 200 | result = i2cdev_check_mux_parents(parent, addr); |
| 200 | result = i2cdev_check_mux_parents( | ||
| 201 | to_i2c_adapter(adapter->dev.parent), addr); | ||
| 202 | 201 | ||
| 203 | return result; | 202 | return result; |
| 204 | } | 203 | } |
| @@ -222,11 +221,11 @@ static int i2cdev_check_mux_children(struct device *dev, void *addrp) | |||
| 222 | driver bound to it, as NOT busy. */ | 221 | driver bound to it, as NOT busy. */ |
| 223 | static int i2cdev_check_addr(struct i2c_adapter *adapter, unsigned int addr) | 222 | static int i2cdev_check_addr(struct i2c_adapter *adapter, unsigned int addr) |
| 224 | { | 223 | { |
| 224 | struct i2c_adapter *parent = i2c_parent_is_i2c_adapter(adapter); | ||
| 225 | int result = 0; | 225 | int result = 0; |
| 226 | 226 | ||
| 227 | if (i2c_parent_is_i2c_adapter(adapter)) | 227 | if (parent) |
| 228 | result = i2cdev_check_mux_parents( | 228 | result = i2cdev_check_mux_parents(parent, addr); |
| 229 | to_i2c_adapter(adapter->dev.parent), addr); | ||
| 230 | 229 | ||
| 231 | if (!result) | 230 | if (!result) |
| 232 | result = device_for_each_child(&adapter->dev, &addr, | 231 | result = device_for_each_child(&adapter->dev, &addr, |
