diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-03-10 10:28:27 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-03-10 10:28:27 +0100 |
commit | 6cbe9e4a228ce00b9fa10d56da6cb7985d7b10e9 (patch) | |
tree | f8e52ed2acd6316d0832f084b4c633f1d19079aa /drivers/i2c/busses/i2c-brcmstb.c | |
parent | futex: Replace barrier() in unqueue_me() with READ_ONCE() (diff) | |
parent | Merge tag 'spi-fix-v4.5-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
download | linux-6cbe9e4a228ce00b9fa10d56da6cb7985d7b10e9.tar.xz linux-6cbe9e4a228ce00b9fa10d56da6cb7985d7b10e9.zip |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-brcmstb.c')
-rw-r--r-- | drivers/i2c/busses/i2c-brcmstb.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-brcmstb.c b/drivers/i2c/busses/i2c-brcmstb.c index 3711df1d4526..4a45408dd820 100644 --- a/drivers/i2c/busses/i2c-brcmstb.c +++ b/drivers/i2c/busses/i2c-brcmstb.c @@ -586,8 +586,7 @@ static int brcmstb_i2c_probe(struct platform_device *pdev) if (!dev) return -ENOMEM; - dev->bsc_regmap = devm_kzalloc(&pdev->dev, sizeof(struct bsc_regs *), - GFP_KERNEL); + dev->bsc_regmap = devm_kzalloc(&pdev->dev, sizeof(*dev->bsc_regmap), GFP_KERNEL); if (!dev->bsc_regmap) return -ENOMEM; |