Unverified Commit dbdaca13 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-5.19/drivers' of https://github.com/Broadcom/stblinux into arm/drivers 

This pull request contains Broadcom ARM/ARM64 SoCs drivers changes for
5.19, please pull the following:

- Qintao adds a missing NULL check to the Broadcom PMB driver after a
  memory allocation

- Li removes the redundant suppress_bind_attrs from the brcmstb_gisb
  driver which only has a probe and no remove function

* tag 'arm-soc/for-5.19/drivers' of https://github.com/Broadcom/stblinux:
  bus: brcmstb_gisb: Remove the suppress_bind_attrs attribute of the driver
  soc: bcm: Check for NULL return of devm_kzalloc()

Link: https://lore.kernel.org/r/20220504210942.1838248-4-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6c6012ab 9235d511

drivers/bus/brcmstb_gisb.c

+0 −1
Original line number Diff line number Diff line
@@ -536,7 +536,6 @@ static struct platform_driver brcmstb_gisb_arb_driver = { 
		.name	= "brcm-gisb-arb",

		.of_match_table = brcmstb_gisb_arb_of_match,

		.pm	= &brcmstb_gisb_arb_pm_ops,

		.suppress_bind_attrs = true,

	},

};

drivers/soc/bcm/bcm63xx/bcm-pmb.c

+3 −0
Original line number Diff line number Diff line
@@ -312,6 +312,9 @@ static int bcm_pmb_probe(struct platform_device *pdev) 
	for (e = table; e->name; e++) {

		struct bcm_pmb_pm_domain *pd = devm_kzalloc(dev, sizeof(*pd), GFP_KERNEL);



		if (!pd)

			return -ENOMEM;



		pd->pmb = pmb;

		pd->data = e;

		pd->genpd.name = e->name;