diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-05 00:30:31 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-05 00:30:31 +0300 |
| commit | 612341bda6ada2bfb2f606e0ce894fca5b6468d9 (patch) | |
| tree | 47b1c24cf79816898ce4cddac93ea6b96235d3fc /drivers | |
| parent | c9946d014fe8da95257a118ba946bd4bd44a0c86 (diff) | |
| parent | ff9e0e3b091291a6694c52074940c5fabd693467 (diff) | |
| download | linux-612341bda6ada2bfb2f606e0ce894fca5b6468d9.tar.xz | |
Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull non-urgent ARM SoC fixes from Arnd Bergmann:
"Smaller patches that didn't seem to find a home in other branches, and
low-priority fixes from late in the merge window.
- Lee Jones retires as bcm2835 (raspberry pi) co-maintainer.
- a couple of bugfixes for the ARM CCN bus driver that were regarded
not important enough
- minor device tree fixes for the Renesas and Marvell platforms, that
came a little late or did not justify have another pull request
after the last -rc"
* tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
bus: arm-ccn: Enable stats for CCN-502 interconnect
dt-bindings: arm-ccn: Add bindings info for CCN-502 compatible string
bus: arm-ccn: Use devm_kcalloc() in arm_ccn_probe()
bus: arm-ccn: Fix module autoload
MAINTAINERS: add RV1108 Rockchip soc to maintained files
ARM: dts: kirkwood: Fix Openblock A6 nand partition overlap
ARM: dts: armadillo800eva: Split LCD mux and gpio
MAINTAINERS: Remove Lee Jones from bcm2835.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bus/arm-ccn.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c index 4d6a2b7e4d3f..e8c6946fed9d 100644 --- a/drivers/bus/arm-ccn.c +++ b/drivers/bus/arm-ccn.c @@ -1520,10 +1520,10 @@ static int arm_ccn_probe(struct platform_device *pdev) if (err) return err; - ccn->node = devm_kzalloc(ccn->dev, sizeof(*ccn->node) * ccn->num_nodes, - GFP_KERNEL); - ccn->xp = devm_kzalloc(ccn->dev, sizeof(*ccn->node) * ccn->num_xps, - GFP_KERNEL); + ccn->node = devm_kcalloc(ccn->dev, ccn->num_nodes, sizeof(*ccn->node), + GFP_KERNEL); + ccn->xp = devm_kcalloc(ccn->dev, ccn->num_xps, sizeof(*ccn->node), + GFP_KERNEL); if (!ccn->node || !ccn->xp) return -ENOMEM; @@ -1544,9 +1544,11 @@ static int arm_ccn_remove(struct platform_device *pdev) } static const struct of_device_id arm_ccn_match[] = { + { .compatible = "arm,ccn-502", }, { .compatible = "arm,ccn-504", }, {}, }; +MODULE_DEVICE_TABLE(of, arm_ccn_match); static struct platform_driver arm_ccn_driver = { .driver = { |