Unverified Commit 608f7cf3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'memory-controller-drv-5.18-2' of... 

Merge tag 'memory-controller-drv-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl into arm/drivers

Memory controller drivers for v5.18, part two

1. TI: Two fixes for TI EMIF driver for quite old error path issues (so
   for unlikely scenarios).
2. Renesas: Document RZ/V2L SoC in bindings.

* tag 'memory-controller-drv-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl:
  dt-bindings: memory: renesas,rpc-if: Document RZ/V2L SoC
  memory: emif: check the pointer temp in get_device_details()
  memory: emif: Add check for setup_interrupts

Link: https://lore.kernel.org/r/20220307082552.55719-1-krzysztof.kozlowski@canonical.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d3d00984 69d69419

Documentation/devicetree/bindings/memory-controllers/renesas,rpc-if.yaml

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ properties: 
      - items:

          - enum:

              - renesas,r9a07g044-rpc-if      # RZ/G2{L,LC}

          - const: renesas,rzg2l-rpc-if       # RZ/G2L family

              - renesas,r9a07g054-rpc-if      # RZ/V2L

          - const: renesas,rzg2l-rpc-if



  reg:

    items:

drivers/memory/emif.c

+5 −3
Original line number Diff line number Diff line
@@ -1025,7 +1025,7 @@ static struct emif_data *__init_or_module get_device_details( 
	temp	= devm_kzalloc(dev, sizeof(*pd), GFP_KERNEL);

	dev_info = devm_kzalloc(dev, sizeof(*dev_info), GFP_KERNEL);



	if (!emif || !pd || !dev_info) {

	if (!emif || !temp || !dev_info) {

		dev_err(dev, "%s:%d: allocation error\n", __func__, __LINE__);

		goto error;

	}
@@ -1117,7 +1117,7 @@ static int __init_or_module emif_probe(struct platform_device *pdev) 
{

	struct emif_data	*emif;

	struct resource		*res;

	int			irq;

	int			irq, ret;



	if (pdev->dev.of_node)

		emif = of_get_memory_device_details(pdev->dev.of_node, &pdev->dev);
@@ -1147,7 +1147,9 @@ static int __init_or_module emif_probe(struct platform_device *pdev) 
	emif_onetime_settings(emif);

	emif_debugfs_init(emif);

	disable_and_clear_all_interrupts(emif);

	setup_interrupts(emif, irq);

	ret = setup_interrupts(emif, irq);

	if (ret)

		goto error;



	/* One-time actions taken on probing the first device */

	if (!emif1) {