Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fccf5166 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-5.1-fixes' of... 

Merge tag 'at91-5.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes

AT91 fixes for 5.1

- fix a typo in sama5d2 pinmuxing which concerns the ISC data 0 signal
- fix a kobject reference leak

* tag 'at91-5.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux

:
  arm/mach-at91/pm : fix possible object reference leak
  ARM: dts: at91: Fix typo in ISC_D0 on PC9

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a9708285 ba5e60c9

arch/arm/boot/dts/sama5d2-pinfunc.h

+1 −1
Original line number Diff line number Diff line
@@ -518,7 +518,7 @@ 
#define PIN_PC9__GPIO			PINMUX_PIN(PIN_PC9, 0, 0)

#define PIN_PC9__FIQ			PINMUX_PIN(PIN_PC9, 1, 3)

#define PIN_PC9__GTSUCOMP		PINMUX_PIN(PIN_PC9, 2, 1)

#define PIN_PC9__ISC_D0			PINMUX_PIN(PIN_PC9, 2, 1)

#define PIN_PC9__ISC_D0			PINMUX_PIN(PIN_PC9, 3, 1)

#define PIN_PC9__TIOA4			PINMUX_PIN(PIN_PC9, 4, 2)

#define PIN_PC10			74

#define PIN_PC10__GPIO			PINMUX_PIN(PIN_PC10, 0, 0)

arch/arm/mach-at91/pm.c

+4 −2
Original line number Diff line number Diff line
@@ -591,13 +591,13 @@ static int __init at91_pm_backup_init(void) 


	np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-securam");

	if (!np)

		goto securam_fail;

		goto securam_fail_no_ref_dev;



	pdev = of_find_device_by_node(np);

	of_node_put(np);

	if (!pdev) {

		pr_warn("%s: failed to find securam device!\n", __func__);

		goto securam_fail;

		goto securam_fail_no_ref_dev;

	}



	sram_pool = gen_pool_get(&pdev->dev, NULL);
@@ -620,6 +620,8 @@ static int __init at91_pm_backup_init(void) 
	return 0;



securam_fail:

	put_device(&pdev->dev);

securam_fail_no_ref_dev:

	iounmap(pm_data.sfrbu);

	pm_data.sfrbu = NULL;

	return ret;