projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
[cascardo/linux.git]
/
drivers
/
i2c
/
i2c-mux.c
diff --git
a/drivers/i2c/i2c-mux.c
b/drivers/i2c/i2c-mux.c
index
797e311
..
2d0847b
100644
(file)
--- a/
drivers/i2c/i2c-mux.c
+++ b/
drivers/i2c/i2c-mux.c
@@
-139,6
+139,8
@@
struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent,
priv->adap.algo = &priv->algo;
priv->adap.algo_data = priv;
priv->adap.dev.parent = &parent->dev;
+ priv->adap.retries = parent->retries;
+ priv->adap.timeout = parent->timeout;
/* Sanity check on class */
if (i2c_mux_parent_classes(parent) & class)