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

Commit 0cc7d0a6 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-soc-4.11-1' of git://git.infradead.org/linux-mvebu into next/soc 

mvebu soc for 4.11 (part 1)

Cleanup up on dove pmu and mv78x00 pci

* tag 'mvebu-soc-4.11-1' of git://git.infradead.org/linux-mvebu

:
  soc: dove: constify reset_control_ops structures
  ARM: mv78xx0: fix possible PCI buffer overflow

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

arch/arm/mach-mv78xx0/pcie.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ struct pcie_port { 
	u8			root_bus_nr;

	void __iomem		*base;

	spinlock_t		conf_lock;

	char			mem_space_name[16];

	char			mem_space_name[20];

	struct resource		res;

};

drivers/soc/dove/pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static int pmu_reset_deassert(struct reset_controller_dev *rc, unsigned long id) 
	return 0;

}



static struct reset_control_ops pmu_reset_ops = {

static const struct reset_control_ops pmu_reset_ops = {

	.reset = pmu_reset_reset,

	.assert = pmu_reset_assert,

	.deassert = pmu_reset_deassert,