diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-09-30 00:30:51 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-09-30 00:30:51 +0300 |
commit | accc3b4a572bba903a801a393532272727f83f5b (patch) | |
tree | b6677755ec43793d5719246f51e27f0e9d12b6c0 /drivers/i2c/i2c-mux.c | |
parent | 510bbf82f8dc36804114873d30ed1d0c8533af81 (diff) | |
parent | 511cce163b75bc3933fa3de769a82bb7e8663f2b (diff) | |
download | linux-accc3b4a572bba903a801a393532272727f83f5b.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/i2c/i2c-mux.c')
-rw-r--r-- | drivers/i2c/i2c-mux.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index 774507b54b57..313904be5f3b 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -243,9 +243,10 @@ struct i2c_mux_core *i2c_mux_alloc(struct i2c_adapter *parent, int (*deselect)(struct i2c_mux_core *, u32)) { struct i2c_mux_core *muxc; + size_t mux_size; - muxc = devm_kzalloc(dev, struct_size(muxc, adapter, max_adapters) - + sizeof_priv, GFP_KERNEL); + mux_size = struct_size(muxc, adapter, max_adapters); + muxc = devm_kzalloc(dev, size_add(mux_size, sizeof_priv), GFP_KERNEL); if (!muxc) return NULL; if (sizeof_priv) |