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

Commit 20804abd authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-fixes-noncritical-for-v3.7' of... 

Merge tag 'omap-fixes-noncritical-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

From Tony Lindgren:

Non critical omap fixes that we not considered necessary
for the v3.6 -rc cycle.

* tag 'omap-fixes-noncritical-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4: wakeupgen: remove duplicate AUXCOREBOOT* read/write
  ARM: OMAP4: wakeupgen: Fix the typo in AUXCOREBOOT register save
  gpio/omap: fix possible memory leak in omap2_gpio_dev_init()
parents a95aa84f 3c5dc4a7

arch/arm/mach-omap2/gpio.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -60,6 +60,7 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) 
	pdata->regs = kzalloc(sizeof(struct omap_gpio_reg_offs), GFP_KERNEL);

	pdata->regs = kzalloc(sizeof(struct omap_gpio_reg_offs), GFP_KERNEL);

	if (!pdata->regs) {

	if (!pdata->regs) {

		pr_err("gpio%d: Memory allocation failed\n", id);

		pr_err("gpio%d: Memory allocation failed\n", id);

		kfree(pdata);

		return -ENOMEM;

		return -ENOMEM;

	}

	}
@@ -121,6 +122,7 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) 
		break;

		break;

	default:

	default:

		WARN(1, "Invalid gpio bank_type\n");

		WARN(1, "Invalid gpio bank_type\n");

		kfree(pdata->regs);

		kfree(pdata);

		kfree(pdata);

		return -EINVAL;

		return -EINVAL;

	}

	}

arch/arm/mach-omap2/omap-wakeupgen.c

+1 −7
Original line number Original line Diff line number Diff line
@@ -229,13 +229,7 @@ static inline void omap4_irq_save_context(void) 
	/* Save AuxBoot* registers */

	/* Save AuxBoot* registers */

	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);

	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);

	__raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET);

	__raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET);

	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);

	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_1);

	__raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET);



	/* Save SyncReq generation logic */

	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);

	__raw_writel(val, sar_base + AUXCOREBOOT0_OFFSET);

	val = __raw_readl(wakeupgen_base + OMAP_AUX_CORE_BOOT_0);

	__raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET);

	__raw_writel(val, sar_base + AUXCOREBOOT1_OFFSET);





	/* Save SyncReq generation logic */

	/* Save SyncReq generation logic */