diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2019-04-03 14:40:12 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2019-04-16 13:08:13 +0200 |
| commit | 77c1e1e062b639c98ce093f607637ac027936d04 (patch) | |
| tree | 6e0602ec31f9daa399410255aa58d91252fe4d18 /drivers/i2c/muxes | |
| parent | i2c: mux: populate the new *_atomic callbacks (diff) | |
| download | linux-77c1e1e062b639c98ce093f607637ac027936d04.tar.xz linux-77c1e1e062b639c98ce093f607637ac027936d04.zip | |
i2c: demux: handle the new atomic callbacks
If the parent has an atomic callback, we need to translate it the same
way as the non-atomic callback.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c/muxes')
| -rw-r--r-- | drivers/i2c/muxes/i2c-demux-pinctrl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c index 035032e20327..d50454c565ee 100644 --- a/drivers/i2c/muxes/i2c-demux-pinctrl.c +++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c @@ -99,6 +99,8 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne /* Now fill out current adapter structure. cur_chan must be up to date */ priv->algo.master_xfer = i2c_demux_master_xfer; + if (adap->algo->master_xfer_atomic) + priv->algo.master_xfer_atomic = i2c_demux_master_xfer; priv->algo.functionality = i2c_demux_functionality; snprintf(priv->cur_adap.name, sizeof(priv->cur_adap.name), |